shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

devices file: recognize old locking_type 0

Browse Source 
if the old locking_type is 0, set cmd->nolocking so that
it will be applied to the devices file lock.
This commit is contained in:
David Teigland 2021-08-20 10:32:16 -05:00
parent 7fc2d7260b
commit abdae8b136
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/lvmcmdline.c
View File

@ -3026,7 +3026,6 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
struct dm_config_tree *config_string_cft, *config_profile_command_cft, *config_profile_metadata_cft; struct dm_config_tree *config_string_cft, *config_profile_command_cft, *config_profile_metadata_cft;
int ret = 0; int ret = 0;
int locking_type; int locking_type;
int nolocking = 0;
int readonly = 0; int readonly = 0;
int sysinit = 0; int sysinit = 0;
int monitoring; int monitoring;
@ -3191,6 +3190,10 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
} }
cmd->ignorelockingfailure = arg_is_set(cmd, ignorelockingfailure_ARG); cmd->ignorelockingfailure = arg_is_set(cmd, ignorelockingfailure_ARG);
cmd->nolocking = arg_is_set(cmd, nolocking_ARG);
if (_cmd_no_meta_proc(cmd))
cmd->nolocking = 1;
/* Defaults to 1 if not set. */ /* Defaults to 1 if not set. */
locking_type = find_config_tree_int(cmd, global_locking_type_CFG, NULL); locking_type = find_config_tree_int(cmd, global_locking_type_CFG, NULL);
@ -3200,7 +3203,7 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
if ((locking_type == 0) || (locking_type == 5)) { if ((locking_type == 0) || (locking_type == 5)) {
log_warn("WARNING: locking_type (%d) is deprecated, using --nolocking.", locking_type); log_warn("WARNING: locking_type (%d) is deprecated, using --nolocking.", locking_type);
nolocking = 1; cmd->nolocking = 1;
} else if (locking_type == 4) { } else if (locking_type == 4) {
log_warn("WARNING: locking_type (%d) is deprecated, using --sysinit --readonly.", locking_type); log_warn("WARNING: locking_type (%d) is deprecated, using --sysinit --readonly.", locking_type);
@ -3211,18 +3214,13 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
log_warn("WARNING: locking_type (%d) is deprecated, using file locking.", locking_type); log_warn("WARNING: locking_type (%d) is deprecated, using file locking.", locking_type);
} }
cmd->nolocking = arg_is_set(cmd, nolocking_ARG);
if (cmd->nolocking || _cmd_no_meta_proc(cmd))
nolocking = 1;
if ((cmd->sysinit = arg_is_set(cmd, sysinit_ARG))) if ((cmd->sysinit = arg_is_set(cmd, sysinit_ARG)))
sysinit = 1; sysinit = 1;
if (arg_is_set(cmd, readonly_ARG)) if (arg_is_set(cmd, readonly_ARG))
readonly = 1; readonly = 1;
if (nolocking) { if (cmd->nolocking) {
if (!_cmd_no_meta_proc(cmd)) if (!_cmd_no_meta_proc(cmd))
log_warn("WARNING: File locking is disabled."); log_warn("WARNING: File locking is disabled.");
} else { } else {