diff --git a/ChangeLog b/ChangeLog index 453e900..9a47fb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -129,14 +129,14 @@ Latest: * Fixed support for devices with 4k hard sector size (again) * Fixed a potential Oops in the disconnect code * Fixed a race condition that could cause DRBD to consider the peers disk - as Inconstent after resync instead of UpToDate (Bugz 271) + as Inconsistent after resync instead of UpToDate (Bugz 271) * Fixed a reace condition that could cause DRBD to consider the peers disk as Outdated instead of Inconsistent during resync (Bugz 277) * Disallow to start a resync with invalidate / invalidate-remote when the source disk is not UpToDate * Forcing primary works now also for Consistent, not only for Outdated and Inconsistent (Bugz 266) - * Improved robustness against corrupt or malicous sector addresses when + * Improved robustness against corrupt or malicious sector addresses when receiving data * Added the initial-split-brain, it gets called also if the split-brain gets automatically resolved @@ -174,7 +174,7 @@ Latest: resync is not possible but a full resync is necessary. Happens very rarely. (Bugz 260) * Do not drop into StandAlone mode when connection is lost during authentication - * Corrected a null test in the authentication code, found by conccinelle, + * Corrected a null test in the authentication code, found by coccinelle, thanks to upstream integration. The chance to trigger that was probably 10^-9. * crm-fence-peer.sh is now also usable if DRBD is managed from the xen block helper script @@ -285,7 +285,7 @@ Latest: 8.3.0 (api:88/proto:86-89) -------- * Fixed 'sleep with spinlock held' in case online verify found a difference - * Fixed error code pathes in request processing. + * Fixed error code paths in request processing. * Fix for stack smashing in drbdmeta * Fixed a bug that could lead to a crash when detaching/attaching on the primary under heavy IO (Bugz 171) @@ -404,7 +404,7 @@ Changelog for fixes propagated from 8.0.x: -------- * Adding a missing range check in ensure_mdev() * Fix for several potential memory leaks when allocating a device (Bugz 135) - * Fixed error code pathes in request processing (Bugz 149) + * Fixed error code paths in request processing (Bugz 149) * Fixed an minor issue with the exposed data UUID logic (Bugz 164) * Fixed tight attach/detach loops (Bugz 171) * Fixed drbdadm adjust, when a running config contains "--discard-my-data" (Bugz 201) @@ -421,9 +421,9 @@ Changelog for fixes propagated from 8.0.x: * reduce race possibilities in our thread restart code * linux 2.6.27 compatibility * latency improvements using TCP_QUICKACK - * reduced spurious coding differrences between drbd-8.0 and drbd-8.2 + * reduced spurious coding differences between drbd-8.0 and drbd-8.2 * drbdsetup now checks for /proc/drbd instead of playing netlink ping-pong - to determin whether the drbd kernel module is present. + to determine whether the drbd kernel module is present. * fixed (harmless but annoying) stack corruption in drbdadm * adjusted timeouts on 'detach' and 'down' * fixed unit conversion of disk size configuration parameter @@ -474,7 +474,7 @@ Changelog for fixes propagated from 8.0.x: Fixed. * Fixed a race that could deadlock worker and receiver while disconnecting a diskless node from a primary peer. - * Fixed a minimal meory leak, upon each module unload of DRBD. + * Fixed a minimal memory leak, upon each module unload of DRBD. 8.0.10 (api:86/proto:86) -------- diff --git a/Makefile.in b/Makefile.in index fd6a744..8216551 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,7 +84,7 @@ ifeq ($(WITH_KM),yes) @if ! test -e $(KDIR)/Makefile ; then \ echo " SORRY, kernel makefile not found." ;\ echo " You need to tell me a correct KDIR," ;\ - echo " Or install the neccessary kernel source packages." ;\ + echo " Or install the necessary kernel source packages." ;\ echo "" ;\ false;\ fi diff --git a/benchmark/dm.c b/benchmark/dm.c index d8224f7..617f0af 100644 --- a/benchmark/dm.c +++ b/benchmark/dm.c @@ -1,7 +1,7 @@ /* dm.c - Copright 2001-2008 LINBIT Information Technologies + Copyright 2001-2008 LINBIT Information Technologies Philipp Reisner, Lars Ellenberg dm is free software; you can redistribute it and/or modify diff --git a/debian/drbd8-utils.prerm b/debian/drbd8-utils.prerm index 192a5c5..640cfa9 100644 --- a/debian/drbd8-utils.prerm +++ b/debian/drbd8-utils.prerm @@ -1,7 +1,7 @@ #!/bin/sh # This script silently ignores the initscript return code if we remove -# or deconfigure the package or carefully pay attention to it if we +# or deconfigure the package or carefuly pay attention to it if we # upgrade the package. # Cyril Bouthors diff --git a/documentation/drbd.conf.xml b/documentation/drbd.conf.xml index 8bf8267..12e6df8 100644 --- a/documentation/drbd.conf.xml +++ b/documentation/drbd.conf.xml @@ -408,7 +408,7 @@ is deprecated. Please note that not all of these might be set for all handlers, and that some - values might not be useable for a definition. + values might not be usable for a definition. diff --git a/drbd/Kbuild b/drbd/Kbuild index eddddd8..4a04f2f 100644 --- a/drbd/Kbuild +++ b/drbd/Kbuild @@ -4,7 +4,7 @@ clean-files := compat.h .config.timestamp LINUXINCLUDE := -I$(src) $(LINUXINCLUDE) -# Files in the standard include directories take precendence over files +# Files in the standard include directories take precedence over files # in the compat directory. # # Add -I$(src) to EXTRA_CFLAGS again: some (rhel5, maybe other) kbuild does not diff --git a/drbd/Makefile b/drbd/Makefile index 2922cda..dad663d 100644 --- a/drbd/Makefile +++ b/drbd/Makefile @@ -32,7 +32,7 @@ DESTDIR ?= / # since 2.6.16, KERNELRELEASE may be empty, -# e.g. when building agains some (broken?) linux-header package. +# e.g. when building against some (broken?) linux-header package. # Lets test on PATCHLEVEL, that won't change too soon... ifneq ($(PATCHLEVEL),) diff --git a/drbd/drbd_req.c b/drbd/drbd_req.c index 102fdea..0a754e8 100644 --- a/drbd/drbd_req.c +++ b/drbd/drbd_req.c @@ -376,7 +376,7 @@ void req_may_be_completed(struct drbd_request *req, struct bio_and_error *m) req->master_bio = NULL; } else { /* Assert that this will be _req_is_done() - * with this very invokation. */ + * with this very invocation. */ /* FIXME: * what about (RQ_LOCAL_PENDING | RQ_LOCAL_ABORTED)? */ diff --git a/drbd/drbd_state.h b/drbd/drbd_state.h index b9290ab..ec0cd61 100644 --- a/drbd/drbd_state.h +++ b/drbd/drbd_state.h @@ -102,7 +102,7 @@ union drbd_dev_state { unsigned peer:2 ; /* 3/4 primary/secondary/unknown */ unsigned role:2 ; /* 3/4 primary/secondary/unknown */ #else -# error "this endianess is not supported" +# error "this endianness is not supported" #endif }; unsigned int i; diff --git a/drbd/linux/drbd_genl.h b/drbd/linux/drbd_genl.h index 826008f..f591723 100644 --- a/drbd/linux/drbd_genl.h +++ b/drbd/linux/drbd_genl.h @@ -190,7 +190,7 @@ GENL_struct(DRBD_NLA_STATE_INFO, 8, state_info, /* These are for broadcast from after state change work. * prev_state and new_state are from the moment the state change took - * place, new_state is not neccessarily the same as current_state, + * place, new_state is not necessarily the same as current_state, * there may have been more state changes since. Which will be * broadcasted soon, in their respective after state change work. */ __u32_field(5, DRBD_GENLA_F_MANDATORY, prev_state) diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 57eadfd..ee36ead 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -2,7 +2,7 @@ # # This file is part of DRBD by Philipp Reisner & Lars Ellenberg. # -# Copright 2001-2008 LINBIT Information Technologies +# Copyright 2001-2008 LINBIT Information Technologies # Philipp Reisner, Lars Ellenberg # # drbd is free software; you can redistribute it and/or modify diff --git a/scripts/block-drbd b/scripts/block-drbd old mode 100755 new mode 100644 index 02d31a5..23a7b93 --- a/scripts/block-drbd +++ b/scripts/block-drbd @@ -57,16 +57,16 @@ dir=$(dirname "$0") . "$dir/block-common.sh" ## -# canonicalise_mode mode +# canonicalize_mode mode # # Takes the given mode, which may be r, w, ro, rw, w!, or rw!, or variations -# thereof, and canonicalises them to one of +# thereof, and canonicalizes them to one of # # 'r': perform checks for a new read-only mount; # 'w': perform checks for a read-write mount; or # '!': perform no checks at all. # -canonicalise_mode() +canonicalize_mode() { local mode="$1" @@ -174,7 +174,7 @@ same_vm() check_device_sharing() { local dev="$1" - local mode=$(canonicalise_mode "$2") + local mode=$(canonicalize_mode "$2") local result if [ "x$mode" = 'x!' ] diff --git a/scripts/crm-fence-peer.sh b/scripts/crm-fence-peer.sh old mode 100755 new mode 100644 index 0f50f7b..9e5e09d --- a/scripts/crm-fence-peer.sh +++ b/scripts/crm-fence-peer.sh @@ -81,7 +81,7 @@ fence_peer_init() # shoot it, just to be sure. # # --dc-timeout is how long we try to contact a DC before we give up. -# This is neccessary, because placing the constraint will fail (with some +# This is necessary, because placing the constraint will fail (with some # internal timeout) if no DC was available when we request the constraint. # Which is likely if the DC crashed. Then the surviving DRBD Primary needs # to wait for a new DC to be elected. Usually such election takes only @@ -105,7 +105,7 @@ fence_peer_init() # # If peer is still reachable according to the cib, # we first poll the cib until timeout has elapsed, -# or the peer becomes definetely unreachable. +# or the peer becomes definitely unreachable. # # This gives STONITH the chance to kill us. # With "fencing resource-and-stontith;" this protects us against @@ -141,7 +141,7 @@ fence_peer_init() # place the constraint - if the peer had better data, it should have a # higher master score, and we should not have been asked to become # primary. If the peer is not reachable, we don't do anything, and drbd -# will refuse to be promoted. This is neccessary to avoid problems +# will refuse to be promoted. This is necessary to avoid problems # With data diversion, in case this "crash" was due to a STONITH operation, # maybe the reboot did not fix our cluster communications! # @@ -244,7 +244,7 @@ drbd_peer_fencing() if [[ -z $have_constraint ]] ; then # try to place it. - # interessting: + # interesting: # In case this is a two-node cluster (still common with # drbd clusters) it does not have real quorum. # If it is configured to do stonith, and reboot, @@ -361,7 +361,7 @@ check_peer_node_reachable() nr_other_nodes=$(echo "$state_lines" | grep -v -F uname=\"$HOSTNAME\" | wc -l) if [[ $nr_other_nodes -gt 1 ]]; then # Many nodes cluster, look at $DRBD_PEER, if set. - # Note that this should not be neccessary. The problem + # Note that this should not be necessary. The problem # we try to solve is relevant on two-node clusters # (no real quorum) if [[ $DRBD_PEER ]]; then diff --git a/scripts/drbd.gentoo b/scripts/drbd.gentoo index d34caaa..1c2b295 100644 --- a/scripts/drbd.gentoo +++ b/scripts/drbd.gentoo @@ -1,6 +1,6 @@ #!/sbin/runscript # Distributed under the terms of the GNU General Public License v2 -# Copright 2001-2008 LINBIT Information Technologies +# Copyright 2001-2008 LINBIT Information Technologies # Philipp Reisner, Lars Ellenberg # Original script adapted to gentoo environment diff --git a/scripts/drbd.ocf b/scripts/drbd.ocf old mode 100644 new mode 100755 index 7d3e0f1..9c5df30 --- a/scripts/drbd.ocf +++ b/scripts/drbd.ocf @@ -53,12 +53,18 @@ if test -n "${OCF_FUNCTIONS_DIR}" ; then . "${OCF_FUNCTIONS_DIR}/ocf-shellfuncs" elif test -e "${OCF_FUNCTIONS_DIR}/.ocf-shellfuncs" ; then . "${OCF_FUNCTIONS_DIR}/.ocf-shellfuncs" + else + echo Error: ocf-shellfuncs not found + exit 1 fi else if test -e "${OCF_ROOT}/lib/heartbeat/ocf-shellfuncs" ; then . "${OCF_ROOT}/lib/heartbeat/ocf-shellfuncs" elif test -e "${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs"; then . "${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs" + else + echo Error: ocf-shellfuncs not found + exit 1 fi fi @@ -209,7 +215,7 @@ do_drbdadm() { do_cmd $DRBDADM "$@" ret=$? - # having the version mismatch warning once per RA invokation + # having the version mismatch warning once per RA invocation # should be enough. export DRBD_DONT_WARN_ON_VERSION_MISMATCH= @@ -334,7 +340,7 @@ drbd_update_master_score() { # in case the scores given by this RA do not suffice, this is the # value space you can work with: # -INFINITY: Do not promote. Really. Won't work anyways. - # Too bad, at least with current (Oktober 2009) Pacemaker, + # Too bad, at least with current (October 2009) Pacemaker, # negative master scores cause instance stop; restart cycle :( # missing, zero: Do not promote. # I think my data is not good enough. @@ -401,13 +407,13 @@ drbd_update_master_score() { # the first time, which would cause a monitor to revoke the # master score! # - # At least some of our local disks are not really useable. + # At least some of our local disks are not really usable. # Our peer is not all good either (or some previous case block # would have matched). We have no access to useful data. # DRBD would refuse to be promoted, anyways. # # set_master_score -INFINITY - # Too bad, at least with current (Oktober 2009) Pacemaker, + # Too bad, at least with current (October 2009) Pacemaker, # negative master scores cause instance stop; restart cycle :( # Hope that this will suffice. remove_master_score @@ -687,7 +693,7 @@ drbd_stop() { # Relevant for >= 8.4. do_drbdadm down $DRBD_RESOURCE # But ignore any return codes, - # we are not running, so stop is successfull. + # we are not running, so stop is successful. rc=$OCF_SUCCESS break ;; @@ -715,7 +721,7 @@ drbd_notify() { local n_type=$OCF_RESKEY_CRM_meta_notify_type local n_op=$OCF_RESKEY_CRM_meta_notify_operation - # active_* and *_resource not really interessting + # active_* and *_resource not really interesting # : "== DEBUG == active = $OCF_RESKEY_CRM_meta_notify_active_uname" : "== DEBUG == slave = $OCF_RESKEY_CRM_meta_notify_slave_uname" : "== DEBUG == master = $OCF_RESKEY_CRM_meta_notify_master_uname" diff --git a/scripts/drbddisk b/scripts/drbddisk old mode 100755 new mode 100644 index f9f9822..27e315f --- a/scripts/drbddisk +++ b/scripts/drbddisk @@ -2,7 +2,7 @@ # # This script is inteded to be used as resource script by heartbeat # -# Copright 2003-2008 LINBIT Information Technologies +# Copyright 2003-2008 LINBIT Information Technologies # Philipp Reisner, Lars Ellenberg # ### diff --git a/scripts/outdate-peer.sh b/scripts/outdate-peer.sh old mode 100755 new mode 100644 index 684ddb4..8c72f12 --- a/scripts/outdate-peer.sh +++ b/scripts/outdate-peer.sh @@ -7,7 +7,7 @@ # # It is expected that your clustermanager of choice brings its own # implementation of this ... E.g. Heartbeat's variant should be able -# to use all of Heartbeat's communication pathes, including the +# to use all of Heartbeat's communication paths, including the # serial connections. # @@ -33,7 +33,7 @@ # 4. Do this a second time for each IP address, now it should not ask # any questions... # -# Repeate this 4 steps for the other direction, BTW, you can not +# Repeat this 4 steps for the other direction, BTW, you can not # copy the file over, since you have two distrinct keys.. and also # the IP addresses in the from="" part are different. # diff --git a/scripts/snapshot-resync-target-lvm.sh b/scripts/snapshot-resync-target-lvm.sh old mode 100755 new mode 100644 index 8eec5d1..e35b8e7 --- a/scripts/snapshot-resync-target-lvm.sh +++ b/scripts/snapshot-resync-target-lvm.sh @@ -9,7 +9,7 @@ ########### # # There will be no resync if this script terminates with an -# exit code != 0. So be carefull with the exit code! +# exit code != 0. So be careful with the exit code! # export LC_ALL=C LANG=C diff --git a/user/drbdadm_main.c b/user/drbdadm_main.c index 33d9d28..dbed547 100644 --- a/user/drbdadm_main.c +++ b/user/drbdadm_main.c @@ -1365,11 +1365,11 @@ static void expand_common(void) } } -static void find_drbdcmd(char **cmd, char **pathes) +static void find_drbdcmd(char **cmd, char **paths) { char **path; - path = pathes; + path = paths; while (*path) { if (access(*path, X_OK) == 0) { *cmd = *path; @@ -3594,26 +3594,26 @@ int parse_options(int argc, char **argv, struct adm_cmd **cmd, char ***resource_ break; case 's': { - char *pathes[2]; - pathes[0] = optarg; - pathes[1] = 0; - find_drbdcmd(&drbdsetup, pathes); + char *paths[2]; + paths[0] = optarg; + paths[1] = 0; + find_drbdcmd(&drbdsetup, paths); } break; case 'm': { - char *pathes[2]; - pathes[0] = optarg; - pathes[1] = 0; - find_drbdcmd(&drbdmeta, pathes); + char *paths[2]; + paths[0] = optarg; + paths[1] = 0; + find_drbdcmd(&drbdmeta, paths); } break; case 'p': { - char *pathes[2]; - pathes[0] = optarg; - pathes[1] = 0; - find_drbdcmd(&drbd_proxy_ctl, pathes); + char *paths[2]; + paths[0] = optarg; + paths[1] = 0; + find_drbdcmd(&drbd_proxy_ctl, paths); } break; case 'n': diff --git a/user/drbdadm_parser.h b/user/drbdadm_parser.h index 58f4f82..da24a43 100644 --- a/user/drbdadm_parser.h +++ b/user/drbdadm_parser.h @@ -65,7 +65,7 @@ enum yytokentype { TK_NET, TK_DISK, TK_SKIP, - TK_SYNCER, /* depricated after 8.3 */ + TK_SYNCER, /* deprecated after 8.3 */ TK_STARTUP, TK_DISABLE_IP_VERIFICATION, TK_DIALOG_REFRESH, diff --git a/user/drbdmeta.c b/user/drbdmeta.c index c34e6dc..ccd7f8b 100644 --- a/user/drbdmeta.c +++ b/user/drbdmeta.c @@ -288,7 +288,7 @@ struct format { uint64_t bm_offset; /* if create_md actually does convert, - * we want to wipe the old meta data block _after_ convertion. */ + * we want to wipe the old meta data block _after_ conversion. */ uint64_t wipe_fixed; uint64_t wipe_flex; @@ -756,7 +756,7 @@ int v84_al_disk_to_cpu(struct al_4k_cpu *al_cpu, struct al_4k_transaction_on_dis al_cpu->context_size = be16_to_cpu(al_disk->context_size.be); al_cpu->context_start_slot_nr = be16_to_cpu(al_disk->context_start_slot_nr.be); - /* reserverd al_disk->__reserved[4] */ + /* reserved al_disk->__reserved[4] */ for (i=0; i < AL_UPDATES_PER_TRANSACTION; i++) al_cpu->update_slot_nr[i] = be16_to_cpu(al_disk->update_slot_nr[i].be); @@ -3437,7 +3437,7 @@ void check_internal_md_flavours(struct format * cfg) { if (is_v08(cfg)) { if (have_flex_v08) { if (!confirmed("Do you really want to overwrite the existing v08 meta-data?")) { - printf("Operation cancelled.\n"); + printf("Operation canceled.\n"); exit(1); // 1 to avoid online resource counting } /* no need to wipe flex offset, @@ -3451,14 +3451,14 @@ void check_internal_md_flavours(struct format * cfg) { md_convert_07_to_08(cfg); /* goto wipe; */ } else if (!confirmed("So you want me to wipe out the v07 meta-data?")) { - printf("Operation cancelled.\n"); + printf("Operation canceled.\n"); exit(1); // 1 to avoid online resource counting } } } else { /* is_v07(cfg) */ if (have_fixed_v07 || have_flex_v07) { if (!confirmed("Do you really want to overwrite the existing v07 meta-data?")) { - printf("Operation cancelled.\n"); + printf("Operation canceled.\n"); exit(1); // 1 to avoid online resource counting } /* no need to wipe the requested flavor, @@ -3506,7 +3506,7 @@ void check_external_md_flavours(struct format * cfg) { if (cfg->md.magic) { if (!confirmed("Valid meta data seems to be in place.\n" "Do you really want to overwrite?")) { - printf("Operation cancelled.\n"); + printf("Operation canceled.\n"); exit(1); } cfg->md.magic = 0; /* will be re-initialized below */ @@ -3524,7 +3524,7 @@ void check_external_md_flavours(struct format * cfg) { } if (!confirmed("So you want me to replace the v07 meta-data\n" "with newly initialized v08 meta-data?")) { - printf("Operation cancelled.\n"); + printf("Operation canceled.\n"); exit(1); } } else if (is_v07(cfg)) { @@ -3538,7 +3538,7 @@ void check_external_md_flavours(struct format * cfg) { } if (!confirmed("So you want me to replace the v08 meta-data\n" "with newly initialized v07 meta-data?")) { - printf("Operation cancelled.\n"); + printf("Operation canceled.\n"); exit(1); } } @@ -3681,7 +3681,7 @@ int meta_create_md(struct format *cfg, char **argv __attribute((unused)), int ar if (!cfg->md.magic) /* not converted: initialize */ err = cfg->ops->md_initialize(cfg); /* Clears on disk AL implicitly */ else - err = 0; /* we have sucessfully converted somthing */ + err = 0; /* we have successfully converted somthing */ /* FIXME * if this converted fixed-size 128MB internal meta data @@ -3717,7 +3717,7 @@ int meta_wipe_md(struct format *cfg, char **argv __attribute((unused)), int argc } if (!confirmed("Do you really want to wipe out the DRBD meta data?")) { - printf("Operation cancelled.\n"); + printf("Operation canceled.\n"); exit(1); } diff --git a/user/drbdsetup.c b/user/drbdsetup.c index 33f2448..9d4be30 100644 --- a/user/drbdsetup.c +++ b/user/drbdsetup.c @@ -1665,7 +1665,7 @@ static int show_scmd(struct drbd_cmd *cm, struct genl_info *info) } call_count++; - /* FIXME: Is the folowing check needed? */ + /* FIXME: Is the following check needed? */ if (!global_attrs[DRBD_NLA_CFG_CONTEXT]) dbg(1, "unexpected packet, configuration context missing!\n"); diff --git a/user/drbdtool_common.c b/user/drbdtool_common.c index 9e5f995..7de240f 100644 --- a/user/drbdtool_common.c +++ b/user/drbdtool_common.c @@ -536,7 +536,7 @@ char *lk_bdev_path(unsigned minor) * without scanning the full device for magic numbers. */ -/* these return 0 on sucess, error code if something goes wrong. */ +/* these return 0 on success, error code if something goes wrong. */ /* NOTE: file format for now: * one line, starting with size in byte, followed by tab, diff --git a/user/drbdtool_common.h b/user/drbdtool_common.h index 57572e0..40c846b 100644 --- a/user/drbdtool_common.h +++ b/user/drbdtool_common.h @@ -101,7 +101,7 @@ struct bdev_info { char *bd_name; }; -/* these return 0 on sucess, error code if something goes wrong. */ +/* these return 0 on success, error code if something goes wrong. */ /* create (update) the last-known-bdev-info file */ extern int lk_bdev_save(const unsigned minor, const struct bdev_info *bd); /* we may want to remove all stored information */ diff --git a/user/legacy/drbdadm_main.c b/user/legacy/drbdadm_main.c index e31d5e2..235281b 100644 --- a/user/legacy/drbdadm_main.c +++ b/user/legacy/drbdadm_main.c @@ -1226,11 +1226,11 @@ static void expand_common(void) } } -static void find_drbdcmd(char **cmd, char **pathes) +static void find_drbdcmd(char **cmd, char **paths) { char **path; - path = pathes; + path = paths; while (*path) { if (access(*path, X_OK) == 0) { *cmd = *path; @@ -3010,26 +3010,26 @@ int parse_options(int argc, char **argv) break; case 's': { - char *pathes[2]; - pathes[0] = optarg; - pathes[1] = 0; - find_drbdcmd(&drbdsetup, pathes); + char *paths[2]; + paths[0] = optarg; + paths[1] = 0; + find_drbdcmd(&drbdsetup, paths); } break; case 'm': { - char *pathes[2]; - pathes[0] = optarg; - pathes[1] = 0; - find_drbdcmd(&drbdmeta, pathes); + char *paths[2]; + paths[0] = optarg; + paths[1] = 0; + find_drbdcmd(&drbdmeta, paths); } break; case 'p': { - char *pathes[2]; - pathes[0] = optarg; - pathes[1] = 0; - find_drbdcmd(&drbd_proxy_ctl, pathes); + char *paths[2]; + paths[0] = optarg; + paths[1] = 0; + find_drbdcmd(&drbd_proxy_ctl, paths); } break; case 'n': diff --git a/user/legacy/drbdsetup.c b/user/legacy/drbdsetup.c index bf2eb2b..33138be 100644 --- a/user/legacy/drbdsetup.c +++ b/user/legacy/drbdsetup.c @@ -456,7 +456,7 @@ static const char *error_messages[] = { "the kernel. (Maybe you need to modprobe it, or modprobe hmac?)", EM(ERR_AUTH_ALG_ND) = "The 'cram-hmac-alg' you specified is not a digest.", EM(ERR_NOMEM) = "kmalloc() failed. Out of memory?", - EM(ERR_DISCARD) = "--discard-my-data not gllowed when primary.", + EM(ERR_DISCARD) = "--discard-my-data not allowed when primary.", EM(ERR_DISK_CONFIGURED) = "Device is attached to a disk (use detach first)", EM(ERR_NET_CONFIGURED) = "Device has a net-config (use disconnect first)", EM(ERR_MANDATORY_TAG) = "UnknownMandatoryTag", diff --git a/user/legacy/drbdtool_common.c b/user/legacy/drbdtool_common.c index 2c7174d..323454e 100644 --- a/user/legacy/drbdtool_common.c +++ b/user/legacy/drbdtool_common.c @@ -560,7 +560,7 @@ char *lk_bdev_path(unsigned minor) * without scanning the full device for magic numbers. */ -/* these return 0 on sucess, error code if something goes wrong. */ +/* these return 0 on success, error code if something goes wrong. */ /* NOTE: file format for now: * one line, starting with size in byte, followed by tab, diff --git a/user/legacy/drbdtool_common.h b/user/legacy/drbdtool_common.h index 8372640..c162eb5 100644 --- a/user/legacy/drbdtool_common.h +++ b/user/legacy/drbdtool_common.h @@ -104,7 +104,7 @@ struct bdev_info { char *bd_name; }; -/* these return 0 on sucess, error code if something goes wrong. */ +/* these return 0 on success, error code if something goes wrong. */ /* create (update) the last-known-bdev-info file */ extern int lk_bdev_save(const unsigned minor, const struct bdev_info *bd); /* we may want to remove all stored information */ diff --git a/user/legacy/linux/drbd.h b/user/legacy/linux/drbd.h index 63c0808..d2e8339 100644 --- a/user/legacy/linux/drbd.h +++ b/user/legacy/linux/drbd.h @@ -39,7 +39,7 @@ /* Altough the Linux source code makes a difference between generic endianness and the bitfields' endianness, there is no - architecture as of Linux-2.6.24-rc4 where the bitfileds' endianness + architecture as of Linux-2.6.24-rc4 where the bitfields' endianness does not match the generic endianness. */ #if __BYTE_ORDER == __LITTLE_ENDIAN @@ -178,7 +178,7 @@ enum drbd_conns { /* These temporal states are all used on the way * from >= C_CONNECTED to Unconnected. * The 'disconnect reason' states - * I do not allow to change beween them. */ + * I do not allow to change between them. */ C_TIMEOUT, C_BROKEN_PIPE, C_NETWORK_FAILURE, @@ -230,7 +230,7 @@ union drbd_state { * pointed out by Maxim Uvarov q * even though we transmit as "cpu_to_be32(state)", * the offsets of the bitfields still need to be swapped - * on different endianess. + * on different endianness. */ struct { #if defined(__LITTLE_ENDIAN_BITFIELD) @@ -260,7 +260,7 @@ union drbd_state { unsigned peer:2 ; /* 3/4 primary/secondary/unknown */ unsigned role:2 ; /* 3/4 primary/secondary/unknown */ #else -# error "this endianess is not supported" +# error "this endianness is not supported" #endif #ifndef DRBD_DEBUG_STATE_CHANGES # ifdef CONFIG_DYNAMIC_DEBUG diff --git a/user/legacy/linux/drbd_config.h b/user/legacy/linux/drbd_config.h index 1a161a0..917a82f 100644 --- a/user/legacy/linux/drbd_config.h +++ b/user/legacy/linux/drbd_config.h @@ -103,7 +103,7 @@ extern const char *drbd_buildtag(void); #define KERNEL_HAS_KVEC -/* Actually availabe since 2.6.26, but vendors have backported... +/* Actually available since 2.6.26, but vendors have backported... */ #define KERNEL_HAS_PROC_CREATE_DATA diff --git a/user/legacy/linux/drbd_limits.h b/user/legacy/linux/drbd_limits.h index 1e32193..26ab854 100644 --- a/user/legacy/linux/drbd_limits.h +++ b/user/legacy/linux/drbd_limits.h @@ -43,7 +43,7 @@ /* net { */ /* timeout, unit centi seconds - * more than one minute timeout is not usefull */ + * more than one minute timeout is not useful */ #define DRBD_TIMEOUT_MIN 1 #define DRBD_TIMEOUT_MAX 600 #define DRBD_TIMEOUT_DEF 60 /* 6 seconds */ @@ -73,7 +73,7 @@ #define DRBD_MAX_EPOCH_SIZE_MAX 20000 #define DRBD_MAX_EPOCH_SIZE_DEF 2048 - /* I don't think that a tcp send buffer of more than 10M is usefull */ + /* I don't think that a tcp send buffer of more than 10M is useful */ #define DRBD_SNDBUF_SIZE_MIN 0 #define DRBD_SNDBUF_SIZE_MAX (10<<20) #define DRBD_SNDBUF_SIZE_DEF 0 @@ -106,7 +106,7 @@ #define DRBD_RATE_MAX (4 << 20) #define DRBD_RATE_DEF 250 /* kb/second */ - /* less than 7 would hit performance unneccessarily. + /* less than 7 would hit performance unnecessarily. * 3833 is the largest prime that still does fit * into 64 sectors of activity log */ #define DRBD_AL_EXTENTS_MIN 7 diff --git a/user/legacy/unaligned.h b/user/legacy/unaligned.h index eb9afd3..bb66239 100644 --- a/user/legacy/unaligned.h +++ b/user/legacy/unaligned.h @@ -24,7 +24,7 @@ /* on some architectures we have to do it in program code */ /* Better not use memcpy(). gcc generates broken code an ARM at higher - optimisation levels + optimization levels */ #define __bad_unaligned_access_size() ({ \ diff --git a/user/libgenl.c b/user/libgenl.c index c70427f..bbc84e0 100644 --- a/user/libgenl.c +++ b/user/libgenl.c @@ -473,7 +473,7 @@ static int validate_nla(struct nlattr *nla, int maxtype, * * Validates all attributes in the specified attribute stream against the * specified policy. Attributes with a type exceeding maxtype will be - * ignored. See documenation of struct nla_policy for more details. + * ignored. See documentation of struct nla_policy for more details. * * Returns 0 on success or a negative error code. */ @@ -495,7 +495,7 @@ errout: } /** - * nla_policy_len - Determin the max. length of a policy + * nla_policy_len - Determine the max. length of a policy * @policy: policy to use * @n: number of policies * @@ -529,7 +529,7 @@ nla_policy_len(const struct nla_policy *p, int n) * @policy: validation policy * * Parses a stream of attributes and stores a pointer to each attribute in - * the tb array accessable via the attribute type. Attributes with a type + * the tb array accessible via the attribute type. Attributes with a type * exceeding maxtype will be silently ignored for backwards compatibility * reasons. policy may be set to NULL if no validation is required. * diff --git a/user/libgenl.h b/user/libgenl.h index a37493a..272bff4 100644 --- a/user/libgenl.h +++ b/user/libgenl.h @@ -136,7 +136,7 @@ static inline void *msg_put(struct msg_buff *msg, unsigned int len) * nlmsg_new() create a new netlink message * nlmsg_put() add a netlink message to an msg * nlmsg_put_answer() callback based nlmsg_put() - * nlmsg_end() finanlize netlink message + * nlmsg_end() finalize netlink message * nlmsg_get_pos() return current position in message * nlmsg_trim() trim part of message * nlmsg_cancel() cancel message construction @@ -253,7 +253,7 @@ static inline void *msg_put(struct msg_buff *msg, unsigned int len) * nla_find() find attribute in stream of attributes * nla_find_nested() find attribute in nested attributes * nla_parse() parse and validate stream of attrs - * nla_parse_nested() parse nested attribuets + * nla_parse_nested() parse nested attributes * nla_for_each_attr() loop over all attributes * nla_for_each_nested() loop over the nested attributes *========================================================================= @@ -462,7 +462,7 @@ static inline int nlmsg_parse(const struct nlmsghdr *nlh, int hdrlen, /** * nlmsg_find_attr - find a specific attribute in a netlink message * @nlh: netlink message header - * @hdrlen: length of familiy specific header + * @hdrlen: length of family specific header * @attrtype: type of attribute to look for * * Returns the first attribute which matches the specified type. @@ -476,8 +476,8 @@ static inline struct nlattr *nlmsg_find_attr(struct nlmsghdr *nlh, /** * nlmsg_validate - validate a netlink message including attributes - * @nlh: netlinket message header - * @hdrlen: length of familiy specific header + * @nlh: netlink message header + * @hdrlen: length of family specific header * @maxtype: maximum attribute type to be expected * @policy: validation policy */ @@ -506,7 +506,7 @@ static inline int nlmsg_report(const struct nlmsghdr *nlh) * nlmsg_for_each_attr - iterate over a stream of attributes * @pos: loop counter, set to current attribute * @nlh: netlink message header - * @hdrlen: length of familiy specific header + * @hdrlen: length of family specific header * @rem: initialized to len, holds bytes currently remaining in stream */ #define nlmsg_for_each_attr(pos, nlh, hdrlen, rem) \ @@ -877,7 +877,7 @@ static inline int nla_nest_end(struct msg_buff *msg, struct nlattr *start) * * Validates all attributes in the nested attribute stream against the * specified policy. Attributes with a type exceeding maxtype will be - * ignored. See documenation of struct nla_policy for more details. + * ignored. See documentation of struct nla_policy for more details. * * Returns 0 on success or a negative error code. */ @@ -923,7 +923,7 @@ struct genl_multicast_group /** * struct genl_family - generic netlink family - * @id: protocol family idenfitier + * @id: protocol family identifier * @hdrsize: length of user specific header in bytes * @name: name of family * @version: protocol version