From 96123b9059f47e200c6529666b9c6d6628dbf2c4 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Sun, 2 Jul 2023 16:41:34 +0200 Subject: [PATCH] cleanup: use spelling synchronize Use single spelling form for synchronize. --- WHATS_NEW | 2 +- WHATS_NEW_DM | 2 +- conf/example.conf.in | 2 +- configure | 12 ++++++------ configure.ac | 12 ++++++------ device_mapper/all.h | 2 +- device_mapper/ioctl/libdm-iface.c | 4 ++-- device_mapper/libdm-common.c | 4 ++-- include/configure.h.in | 2 +- lib/config/config_settings.h | 2 +- lib/metadata/lv_manip.c | 2 +- lib/report/columns.h | 4 ++-- libdm/dm-tools/dmsetup.c | 2 +- libdm/ioctl/libdm-iface.c | 4 ++-- libdm/libdevmapper.h | 2 +- libdm/libdm-common.c | 4 ++-- man/dmfilemapd.8_main | 2 +- man/dmsetup.8_main | 6 +++--- man/dmstats.8_main | 2 +- man/lvchange.8_pregen | 2 +- man/lvconvert.8_pregen | 2 +- man/lvcreate.8_pregen | 2 +- man/lvextend.8_pregen | 2 +- man/lvreduce.8_pregen | 2 +- man/lvremove.8_pregen | 2 +- man/lvrename.8_pregen | 2 +- man/lvresize.8_pregen | 2 +- man/pvmove.8_pregen | 2 +- man/pvscan.8_pregen | 2 +- man/vgchange.8_pregen | 2 +- man/vgremove.8_pregen | 2 +- test/Makefile.in | 6 +++--- test/lib/utils.sh | 6 +++--- test/shell/lvcreate-mirror.sh | 2 +- tools/args.h | 2 +- 35 files changed, 56 insertions(+), 56 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index de40d239d..42955809a 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -3233,7 +3233,7 @@ Version 2.02.68 - 23rd June 2010 Add device name and offset to raw_read_mda_header error messages. Honour log argument when down-converting stacked mirror. Sleep to workaround clvmd -S race: socket closed early and server drops cmd. - Use early udev synchronisation and update of dev nodes for clustered mirrors. + Use early udev synchronization and update of dev nodes for clustered mirrors. Remove incorrect inclusion of kdev_t.h from cmirrord/functions.h. Add man pages for lvmconf and non-existent lvmsadc and lvmsar tools. Exit successfully when using -o help (but not -o +help) with LVM reports. diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index d2129e6ef..5dc45f1af 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1122,7 +1122,7 @@ Version 1.02.37 - 15th September 2009 Version 1.02.36 - 6th August 2009 ================================= Add udevcookies, udevcomplete, udevcomplete_all and --noudevwait to dmsetup. - Add libdevmapper functions to support synchronisation with udev. + Add libdevmapper functions to support synchronization with udev. Version 1.02.35 - 28th July 2009 ================================ diff --git a/conf/example.conf.in b/conf/example.conf.in index 1ed1f854b..1ffef5e61 100644 --- a/conf/example.conf.in +++ b/conf/example.conf.in @@ -1811,7 +1811,7 @@ activation { # Configuration option activation/polling_interval. # Check pvmove or lvconvert progress at this interval (seconds). # When pvmove or lvconvert must wait for the kernel to finish - # synchronising or merging data, they check and report progress at + # synchronizing or merging data, they check and report progress at # intervals of this number of seconds. If this is set to 0 and there # is only one thing to wait for, there are no progress reports, but # the process is awoken immediately once the operation is complete. diff --git a/configure b/configure index 75ceade03..05a5840b5 100755 --- a/configure +++ b/configure @@ -1712,8 +1712,8 @@ Optional Features: --disable-app-machineid disable LVM system ID using app-specific machine-id --disable-blkid_wiping disable libblkid detection of signatures when wiping and use native code instead - --enable-udev_sync enable synchronisation with udev processing - --enable-udev_rules install rule files needed for udev synchronisation + --enable-udev_sync enable synchronization with udev processing + --enable-udev_rules install rule files needed for udev synchronization --enable-udev-rule-exec-detection enable executable path detection in udev rules --enable-units-compat enable output compatibility with old versions that @@ -13156,8 +13156,8 @@ printf "%s\n" "#define DEFAULT_USE_BLKID_WIPING $DEFAULT_USE_BLKID_WIPING" >>con ################################################################################ -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable synchronisation with udev processing" >&5 -printf %s "checking whether to enable synchronisation with udev processing... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable synchronization with udev processing" >&5 +printf %s "checking whether to enable synchronization with udev processing... " >&6; } # Check whether --enable-udev_sync was given. if test ${enable_udev_sync+y} then : @@ -13314,8 +13314,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable installation of udev rules required for synchronisation" >&5 -printf %s "checking whether to enable installation of udev rules required for synchronisation... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable installation of udev rules required for synchronization" >&5 +printf %s "checking whether to enable installation of udev rules required for synchronization... " >&6; } # Check whether --enable-udev_rules was given. if test ${enable_udev_rules+y} then : diff --git a/configure.ac b/configure.ac index efe5176db..652938dfb 100644 --- a/configure.ac +++ b/configure.ac @@ -1133,18 +1133,18 @@ AC_DEFINE_UNQUOTED(DEFAULT_USE_BLKID_WIPING, [$DEFAULT_USE_BLKID_WIPING], [Use blkid wiping by default.]) ################################################################################ -dnl -- Enable udev synchronisation -AC_MSG_CHECKING([whether to enable synchronisation with udev processing]) +dnl -- Enable udev synchronization +AC_MSG_CHECKING([whether to enable synchronization with udev processing]) AC_ARG_ENABLE(udev_sync, AS_HELP_STRING([--enable-udev_sync], - [enable synchronisation with udev processing]), + [enable synchronization with udev processing]), UDEV_SYNC=$enableval, UDEV_SYNC="no") AC_MSG_RESULT([$UDEV_SYNC]) AS_IF([test "$UDEV_SYNC" = "yes"], [ PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"]) UDEV_STATIC_LIBS=$("$PKG_CONFIG" --static --libs libudev) - AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.]) + AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronization with udev processing.]) AC_CHECK_LIB(udev, udev_device_get_is_initialized, AC_DEFINE([HAVE_LIBUDEV_UDEV_DEVICE_GET_IS_INITIALIZED], 1, [Define to 1 if udev_device_get_is_initialized is available.])) @@ -1152,10 +1152,10 @@ AS_IF([test "$UDEV_SYNC" = "yes"], [ ]) dnl -- Enable udev rules -AC_MSG_CHECKING([whether to enable installation of udev rules required for synchronisation]) +AC_MSG_CHECKING([whether to enable installation of udev rules required for synchronization]) AC_ARG_ENABLE(udev_rules, AS_HELP_STRING([--enable-udev_rules], - [install rule files needed for udev synchronisation]), + [install rule files needed for udev synchronization]), UDEV_RULES=$enableval, UDEV_RULES=$UDEV_SYNC) AC_MSG_RESULT([$UDEV_RULES]) diff --git a/device_mapper/all.h b/device_mapper/all.h index 1e19add68..d5b061d4e 100644 --- a/device_mapper/all.h +++ b/device_mapper/all.h @@ -2243,7 +2243,7 @@ struct dm_pool *dm_config_memory(struct dm_config_tree *cft); int dm_cookie_supported(void); /* - * Udev synchronisation functions. + * Udev synchronization functions. */ void dm_udev_set_sync_support(int sync_with_udev); int dm_udev_get_sync_support(void); diff --git a/device_mapper/ioctl/libdm-iface.c b/device_mapper/ioctl/libdm-iface.c index 0cc81b9d9..04abfd543 100644 --- a/device_mapper/ioctl/libdm-iface.c +++ b/device_mapper/ioctl/libdm-iface.c @@ -2066,7 +2066,7 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command, /* * Prevent udev vs. libdevmapper race when processing nodes * and symlinks. This can happen when the udev rules are - * installed and udev synchronisation code is enabled in + * installed and udev synchronization code is enabled in * libdevmapper but the software using libdevmapper does not * make use of it (by not calling dm_task_set_cookie before). * We need to instruct the udev rules not to be applied at @@ -2076,7 +2076,7 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command, if (!dmt->cookie_set && dm_udev_get_sync_support()) { log_debug_activation("Cookie value is not set while trying to call %s " "ioctl. Please, consider using libdevmapper's udev " - "synchronisation interface or disable it explicitly " + "synchronization interface or disable it explicitly " "by calling dm_udev_set_sync_support(0).", dmt->type == DM_DEVICE_RESUME ? "DM_DEVICE_RESUME" : dmt->type == DM_DEVICE_REMOVE ? "DM_DEVICE_REMOVE" : diff --git a/device_mapper/libdm-common.c b/device_mapper/libdm-common.c index 2a03aff10..9d672e833 100644 --- a/device_mapper/libdm-common.c +++ b/device_mapper/libdm-common.c @@ -2311,7 +2311,7 @@ static int _check_semaphore_is_supported(void) if (maxid < 0) { log_warn("Kernel not configured for semaphores (System V IPC). " - "Not using udev synchronisation code."); + "Not using udev synchronization code."); return 0; } @@ -2334,7 +2334,7 @@ static int _check_udev_is_running(void) if (!(r = udev_queue_get_udev_is_active(udev_queue))) log_debug_activation("Udev is not running. " - "Not using udev synchronisation code."); + "Not using udev synchronization code."); udev_queue_unref(udev_queue); udev_unref(udev); diff --git a/include/configure.h.in b/include/configure.h.in index fb5625156..1953cba26 100644 --- a/include/configure.h.in +++ b/include/configure.h.in @@ -695,7 +695,7 @@ /* Define to 1 if your declares `struct tm'. */ #undef TM_IN_SYS_TIME -/* Define to 1 to enable synchronisation with udev processing. */ +/* Define to 1 to enable synchronization with udev processing. */ #undef UDEV_SYNC_SUPPORT /* Enable a valgrind aware build of pool */ diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index fd56993ba..5e4ec253d 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -1696,7 +1696,7 @@ cfg(activation_monitoring_CFG, "monitoring", activation_CFG_SECTION, CFG_DEFAULT cfg(activation_polling_interval_CFG, "polling_interval", activation_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_INTERVAL, vsn(2, 2, 63), NULL, 0, NULL, "Check pvmove or lvconvert progress at this interval (seconds).\n" "When pvmove or lvconvert must wait for the kernel to finish\n" - "synchronising or merging data, they check and report progress at\n" + "synchronizing or merging data, they check and report progress at\n" "intervals of this number of seconds. If this is set to 0 and there\n" "is only one thing to wait for, there are no progress reports, but\n" "the process is awoken immediately once the operation is complete.\n") diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 385903539..a516c1011 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -9302,7 +9302,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, init_mirror_in_sync(lp->nosync); if (lp->nosync) { - log_warn("WARNING: New %s won't be synchronised. " + log_warn("WARNING: New %s won't be synchronized. " "Don't read what you didn't write!", lp->segtype->name); status |= LV_NOTSYNCED; diff --git a/lib/report/columns.h b/lib/report/columns.h index 8719a7e7d..aa3801498 100644 --- a/lib/report/columns.h +++ b/lib/report/columns.h @@ -92,8 +92,8 @@ FIELD(LVS, lv, STR, "Move", lvid, 0, movepv, move_pv, "For pvmove, Source PV of FIELD(LVS, lv, STR, "Move UUID", lvid, 38, movepvuuid, move_pv_uuid, "For pvmove, the UUID of Source PV of temporary LV created by pvmove.", 0) FIELD(LVS, lv, STR, "Convert", lvid, 0, convertlv, convert_lv, "For lvconvert, Name of temporary LV created by lvconvert.", 0) FIELD(LVS, lv, STR, "Convert UUID", lvid, 38, convertlvuuid, convert_lv_uuid, "For lvconvert, UUID of temporary LV created by lvconvert.", 0) -FIELD(LVS, lv, STR, "Log", lvid, 0, loglv, mirror_log, "For mirrors, the LV holding the synchronisation log.", 0) -FIELD(LVS, lv, STR, "Log UUID", lvid, 38, loglvuuid, mirror_log_uuid, "For mirrors, the UUID of the LV holding the synchronisation log.", 0) +FIELD(LVS, lv, STR, "Log", lvid, 0, loglv, mirror_log, "For mirrors, the LV holding the synchronization log.", 0) +FIELD(LVS, lv, STR, "Log UUID", lvid, 38, loglvuuid, mirror_log_uuid, "For mirrors, the UUID of the LV holding the synchronization log.", 0) FIELD(LVS, lv, STR, "Data", lvid, 0, datalv, data_lv, "For cache/thin/vdo pools, the LV holding the associated data.", 0) FIELD(LVS, lv, STR, "Data UUID", lvid, 38, datalvuuid, data_lv_uuid, "For cache/thin/vdo pools, the UUID of the LV holding the associated data.", 0) FIELD(LVS, lv, STR, "Meta", lvid, 0, metadatalv, metadata_lv, "For cache/thin pools, the LV holding the associated metadata.", 0) diff --git a/libdm/dm-tools/dmsetup.c b/libdm/dm-tools/dmsetup.c index 5e485af33..6fb09f865 100644 --- a/libdm/dm-tools/dmsetup.c +++ b/libdm/dm-tools/dmsetup.c @@ -1779,7 +1779,7 @@ static int _set_up_udev_support(const char *dev_dir) * has not done its job correctly, e.g. the nodes were not created. * If using udev transactions by specifying existing cookie value, * we need to disable node creation by libdevmapper completely, - * disabling any fallback actions, since any synchronisation happens + * disabling any fallback actions, since any synchronization happens * at the end of the transaction only. We need to do this to prevent * races between udev and libdevmapper but only in case udev "dev path" * is the same as "dev path" used by libdevmapper. diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c index 2e2da8b99..1493d198b 100644 --- a/libdm/ioctl/libdm-iface.c +++ b/libdm/ioctl/libdm-iface.c @@ -1904,7 +1904,7 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command, /* * Prevent udev vs. libdevmapper race when processing nodes * and symlinks. This can happen when the udev rules are - * installed and udev synchronisation code is enabled in + * installed and udev synchronization code is enabled in * libdevmapper but the software using libdevmapper does not * make use of it (by not calling dm_task_set_cookie before). * We need to instruct the udev rules not to be applied at @@ -1914,7 +1914,7 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command, if (!dmt->cookie_set && dm_udev_get_sync_support()) { log_debug_activation("Cookie value is not set while trying to call %s " "ioctl. Please, consider using libdevmapper's udev " - "synchronisation interface or disable it explicitly " + "synchronization interface or disable it explicitly " "by calling dm_udev_set_sync_support(0).", dmt->type == DM_DEVICE_RESUME ? "DM_DEVICE_RESUME" : dmt->type == DM_DEVICE_REMOVE ? "DM_DEVICE_REMOVE" : diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index c1c6cb40e..8d56cea5b 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -3740,7 +3740,7 @@ struct dm_pool *dm_config_memory(struct dm_config_tree *cft); int dm_cookie_supported(void); /* - * Udev synchronisation functions. + * Udev synchronization functions. */ void dm_udev_set_sync_support(int sync_with_udev); int dm_udev_get_sync_support(void); diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c index 734a0127e..363358802 100644 --- a/libdm/libdm-common.c +++ b/libdm/libdm-common.c @@ -2310,7 +2310,7 @@ static int _check_semaphore_is_supported(void) if (maxid < 0) { log_warn("Kernel not configured for semaphores (System V IPC). " - "Not using udev synchronisation code."); + "Not using udev synchronization code."); return 0; } @@ -2333,7 +2333,7 @@ static int _check_udev_is_running(void) if (!(r = udev_queue_get_udev_is_active(udev_queue))) log_debug_activation("Udev is not running. " - "Not using udev synchronisation code."); + "Not using udev synchronization code."); udev_queue_unref(udev_queue); udev_unref(udev); diff --git a/man/dmfilemapd.8_main b/man/dmfilemapd.8_main index e317166b6..c363dd28f 100644 --- a/man/dmfilemapd.8_main +++ b/man/dmfilemapd.8_main @@ -138,7 +138,7 @@ and placing a new file at the same path. . .SH LIMITATIONS . -The daemon attempts to maintain good synchronisation between the file +The daemon attempts to maintain good synchronization between the file extents and the regions contained in the group, however, since the daemon can only react to new allocations once they have been written, there are inevitably some IO events that cannot be counted when a diff --git a/man/dmsetup.8_main b/man/dmsetup.8_main index 2c8095667..0c53e39b0 100644 --- a/man/dmsetup.8_main +++ b/man/dmsetup.8_main @@ -533,7 +533,7 @@ Do not allow udev to manage nodes for devices in device-mapper directory. . .TP .B --noudevsync -Do not synchronise with udev when creating, renaming or removing devices. +Do not synchronize with udev when creating, renaming or removing devices. . .TP .BR -o | --options " " \fIoptions @@ -570,7 +570,7 @@ See below for more information on the table format. . .TP .B --udevcookie \fIcookie -Use cookie for udev synchronisation. +Use cookie for udev synchronization. Note: Same cookie should be used for same type of operations i.e. creation of multiple different devices. It's not advised to combine different operations on the single device. @@ -589,7 +589,7 @@ Produce additional output. . .TP .B --verifyudev -If udev synchronisation is enabled, verify that udev operations get performed +If udev synchronization is enabled, verify that udev operations get performed correctly and try to fix up the device nodes afterwards if not. . .TP diff --git a/man/dmstats.8_main b/man/dmstats.8_main index eb160751b..a2d649303 100644 --- a/man/dmstats.8_main +++ b/man/dmstats.8_main @@ -851,7 +851,7 @@ and \fB--nomonitor\fP options for further information. . .SS Limitations . -The daemon attempts to maintain good synchronisation between the file +The daemon attempts to maintain good synchronization between the file extents and the regions contained in the group, however, since it can only react to new allocations once they have been written, there are inevitably some IO events that cannot be counted when a file is diff --git a/man/lvchange.8_pregen b/man/lvchange.8_pregen index 3f613482e..ed700421a 100644 --- a/man/lvchange.8_pregen +++ b/man/lvchange.8_pregen @@ -764,7 +764,7 @@ incorrect results. .HP \fB--noudevsync\fP .br -Disables udev synchronisation. The process will not wait for notification +Disables udev synchronization. The process will not wait for notification from udev. It will continue irrespective of any possible udev processing in the background. Only use this if udev is not running or has rules that ignore the devices LVM creates. diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen index 3ecacaacd..3ee331b86 100644 --- a/man/lvconvert.8_pregen +++ b/man/lvconvert.8_pregen @@ -1315,7 +1315,7 @@ incorrect results. .HP \fB--noudevsync\fP .br -Disables udev synchronisation. The process will not wait for notification +Disables udev synchronization. The process will not wait for notification from udev. It will continue irrespective of any possible udev processing in the background. Only use this if udev is not running or has rules that ignore the devices LVM creates. diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen index 27a93d890..99e90fcc7 100644 --- a/man/lvcreate.8_pregen +++ b/man/lvcreate.8_pregen @@ -1220,7 +1220,7 @@ and thus do not support initial synchronization. .HP \fB--noudevsync\fP .br -Disables udev synchronisation. The process will not wait for notification +Disables udev synchronization. The process will not wait for notification from udev. It will continue irrespective of any possible udev processing in the background. Only use this if udev is not running or has rules that ignore the devices LVM creates. diff --git a/man/lvextend.8_pregen b/man/lvextend.8_pregen index 2e0ed3068..7e9654a4a 100644 --- a/man/lvextend.8_pregen +++ b/man/lvextend.8_pregen @@ -490,7 +490,7 @@ and thus do not support initial synchronization. .HP \fB--noudevsync\fP .br -Disables udev synchronisation. The process will not wait for notification +Disables udev synchronization. The process will not wait for notification from udev. It will continue irrespective of any possible udev processing in the background. Only use this if udev is not running or has rules that ignore the devices LVM creates. diff --git a/man/lvreduce.8_pregen b/man/lvreduce.8_pregen index 61b71e4d9..ec9a17d44 100644 --- a/man/lvreduce.8_pregen +++ b/man/lvreduce.8_pregen @@ -259,7 +259,7 @@ incorrect results. .HP \fB--noudevsync\fP .br -Disables udev synchronisation. The process will not wait for notification +Disables udev synchronization. The process will not wait for notification from udev. It will continue irrespective of any possible udev processing in the background. Only use this if udev is not running or has rules that ignore the devices LVM creates. diff --git a/man/lvremove.8_pregen b/man/lvremove.8_pregen index 7ae83f1bb..9f343651d 100644 --- a/man/lvremove.8_pregen +++ b/man/lvremove.8_pregen @@ -211,7 +211,7 @@ incorrect results. .HP \fB--noudevsync\fP .br -Disables udev synchronisation. The process will not wait for notification +Disables udev synchronization. The process will not wait for notification from udev. It will continue irrespective of any possible udev processing in the background. Only use this if udev is not running or has rules that ignore the devices LVM creates. diff --git a/man/lvrename.8_pregen b/man/lvrename.8_pregen index 2c0c4e1b9..fa481616d 100644 --- a/man/lvrename.8_pregen +++ b/man/lvrename.8_pregen @@ -182,7 +182,7 @@ incorrect results. .HP \fB--noudevsync\fP .br -Disables udev synchronisation. The process will not wait for notification +Disables udev synchronization. The process will not wait for notification from udev. It will continue irrespective of any possible udev processing in the background. Only use this if udev is not running or has rules that ignore the devices LVM creates. diff --git a/man/lvresize.8_pregen b/man/lvresize.8_pregen index 89261f38d..622846caa 100644 --- a/man/lvresize.8_pregen +++ b/man/lvresize.8_pregen @@ -439,7 +439,7 @@ and thus do not support initial synchronization. .HP \fB--noudevsync\fP .br -Disables udev synchronisation. The process will not wait for notification +Disables udev synchronization. The process will not wait for notification from udev. It will continue irrespective of any possible udev processing in the background. Only use this if udev is not running or has rules that ignore the devices LVM creates. diff --git a/man/pvmove.8_pregen b/man/pvmove.8_pregen index 53f8a2ac6..b3d9c8a3b 100644 --- a/man/pvmove.8_pregen +++ b/man/pvmove.8_pregen @@ -278,7 +278,7 @@ incorrect results. .HP \fB--noudevsync\fP .br -Disables udev synchronisation. The process will not wait for notification +Disables udev synchronization. The process will not wait for notification from udev. It will continue irrespective of any possible udev processing in the background. Only use this if udev is not running or has rules that ignore the devices LVM creates. diff --git a/man/pvscan.8_pregen b/man/pvscan.8_pregen index 20aec7267..1809b5a5e 100644 --- a/man/pvscan.8_pregen +++ b/man/pvscan.8_pregen @@ -476,7 +476,7 @@ incorrect results. .HP \fB--noudevsync\fP .br -Disables udev synchronisation. The process will not wait for notification +Disables udev synchronization. The process will not wait for notification from udev. It will continue irrespective of any possible udev processing in the background. Only use this if udev is not running or has rules that ignore the devices LVM creates. diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen index 4665e98c8..47a4fa1a2 100644 --- a/man/vgchange.8_pregen +++ b/man/vgchange.8_pregen @@ -713,7 +713,7 @@ incorrect results. .HP \fB--noudevsync\fP .br -Disables udev synchronisation. The process will not wait for notification +Disables udev synchronization. The process will not wait for notification from udev. It will continue irrespective of any possible udev processing in the background. Only use this if udev is not running or has rules that ignore the devices LVM creates. diff --git a/man/vgremove.8_pregen b/man/vgremove.8_pregen index df6588115..045eabc76 100644 --- a/man/vgremove.8_pregen +++ b/man/vgremove.8_pregen @@ -177,7 +177,7 @@ incorrect results. .HP \fB--noudevsync\fP .br -Disables udev synchronisation. The process will not wait for notification +Disables udev synchronization. The process will not wait for notification from udev. It will continue irrespective of any possible udev processing in the background. Only use this if udev is not running or has rules that ignore the devices LVM creates. diff --git a/test/Makefile.in b/test/Makefile.in index bb6167ea5..88681b5b2 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -68,7 +68,7 @@ endif SHELL_PATH_SQ := $(subst ','\'',$(SHELL_PATH)) ifeq ("@UDEV_SYNC@", "yes") -dm_udev_synchronisation = 1 +dm_udev_synchronization = 1 endif all: .tests-stamp @@ -287,7 +287,7 @@ lib/flavour-%: $(srcdir)/lib/flavour-%.sh .lib-dir-stamp lib/paths-common: $(srcdir)/Makefile.in Makefile .lib-dir-stamp $(SHOW) " [PATHS] $@" - $(Q) echo 'DM_UDEV_SYNCHRONISATION=$(dm_udev_synchronisation)' >> $@-t + $(Q) echo 'DM_UDEV_SYNCHRONIZATION=$(dm_udev_synchronization)' >> $@-t $(Q) echo 'LVMPOLLD_PIDFILE="@LVMPOLLD_PIDFILE@"' >> $@-t $(Q) echo 'DMEVENTD_PIDFILE="@DMEVENTD_PIDFILE@"' >> $@-t $(Q) echo 'LVM_TEST_THIN_CHECK_CMD=$${LVM_TEST_THIN_CHECK_CMD-@THIN_CHECK_CMD@}' >> $@-t @@ -298,7 +298,7 @@ lib/paths-common: $(srcdir)/Makefile.in Makefile .lib-dir-stamp $(Q) echo 'LVM_TEST_CACHE_DUMP_CMD=$${LVM_TEST_CACHE_DUMP_CMD-@CACHE_DUMP_CMD@}' >> $@-t $(Q) echo 'LVM_TEST_CACHE_REPAIR_CMD=$${LVM_TEST_CACHE_REPAIR_CMD-@CACHE_REPAIR_CMD@}' >> $@-t $(Q) echo 'LVM_TEST_CACHE_RESTORE_CMD=$${LVM_TEST_CACHE_RESTORE_CMD-@CACHE_RESTORE_CMD@}' >> $@-t - $(Q) echo 'export DM_UDEV_SYNCHRONISATION THIN RAID CACHE\' >> $@-t + $(Q) echo 'export DM_UDEV_SYNCHRONIZATION THIN RAID CACHE\' >> $@-t $(Q) echo ' LVM_TEST_THIN_CHECK_CMD LVM_TEST_THIN_DUMP_CMD LVM_TEST_THIN_REPAIR_CMD LVM_TEST_THIN_RESTORE_CMD\' >> $@-t $(Q) echo ' LVM_TEST_CACHE_CHECK_CMD LVM_TEST_CACHE_DUMP_CMD LVM_TEST_CACHE_REPAIR_CMD LVM_TEST_CACHE_RESTORE_CMD' >> $@-t $(Q) mv $@-t $@ diff --git a/test/lib/utils.sh b/test/lib/utils.sh index 427bc6112..027295a1c 100644 --- a/test/lib/utils.sh +++ b/test/lib/utils.sh @@ -210,7 +210,7 @@ STACKTRACE() { } init_udev_transaction() { - if test "$DM_UDEV_SYNCHRONISATION" = 1; then + if test "$DM_UDEV_SYNCHRONIZATION" = 1; then local cookie cookie=$(dmsetup udevcreatecookie) # Cookie is not generated if udev is not running! @@ -219,14 +219,14 @@ init_udev_transaction() { } finish_udev_transaction() { - if test "$DM_UDEV_SYNCHRONISATION" = 1 && test -n "${DM_UDEV_COOKIE-}" ; then + if test "$DM_UDEV_SYNCHRONIZATION" = 1 && test -n "${DM_UDEV_COOKIE-}" ; then dmsetup udevreleasecookie || true unset DM_UDEV_COOKIE fi } teardown_udev_cookies() { - if test "$DM_UDEV_SYNCHRONISATION" = 1; then + if test "$DM_UDEV_SYNCHRONIZATION" = 1; then # Delete any cookies created more than 10 minutes ago # and not used in the last 10 minutes. # Log only non-zero semaphores count diff --git a/test/shell/lvcreate-mirror.sh b/test/shell/lvcreate-mirror.sh index 0e9237d1f..1cec4c51d 100644 --- a/test/shell/lvcreate-mirror.sh +++ b/test/shell/lvcreate-mirror.sh @@ -26,7 +26,7 @@ check mirror_images_redundant $vg $lv1 # 2-way mirror with disklog, 3 PVs # lvcreate --nosync is in 100% sync after creation (bz429342) lvcreate -aey -l2 --type mirror -m1 --nosync -n $lv2 $vg "$dev1" "$dev2" "$dev3":0-1 2>&1 | tee out -grep "New mirror won't be synchronised." out +grep "New mirror won't be synchronized." out check lv_field $vg/$lv2 copy_percent "100.00" check mirror_images_redundant $vg $lv2 check mirror_log_on $vg $lv2 "$dev3" diff --git a/tools/args.h b/tools/args.h index 24dc8b339..33c40780e 100644 --- a/tools/args.h +++ b/tools/args.h @@ -565,7 +565,7 @@ arg(notifydbus_ARG, '\0', "notifydbus", 0, 0, 0, "notify_dbus config setting is disabled.\n") arg(noudevsync_ARG, '\0', "noudevsync", 0, 0, 0, - "Disables udev synchronisation. The process will not wait for notification\n" + "Disables udev synchronization. The process will not wait for notification\n" "from udev. It will continue irrespective of any possible udev processing\n" "in the background. Only use this if udev is not running or has rules that\n" "ignore the devices LVM creates.\n")