mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-28 11:22:15 +03:00
devices: apply ignorelockingfailure to devices file lock
This commit is contained in:
parent
4df6931c4c
commit
6cd4470e6d
@ -193,6 +193,7 @@ struct cmd_context {
|
||||
unsigned filter_nodata_only:1; /* only use filters that do not require data from the dev */
|
||||
unsigned run_by_dmeventd:1; /* command is being run by dmeventd */
|
||||
unsigned sysinit:1; /* --sysinit is used */
|
||||
unsigned ignorelockingfailure:1; /* --ignorelockingfailure is used */
|
||||
unsigned check_devs_used:1; /* check devs used by LVs */
|
||||
unsigned print_device_id_not_found:1; /* print devices file entries not found */
|
||||
unsigned ignore_device_name_mismatch:1; /* skip updating devices file names */
|
||||
|
@ -2268,7 +2268,7 @@ static int _lock_devices_file(struct cmd_context *cmd, int mode, int nonblock, i
|
||||
fd = open(_devices_lockfile, O_CREAT|O_RDWR, S_IRUSR | S_IWUSR);
|
||||
if (fd < 0) {
|
||||
log_debug("lock_devices_file open errno %d", errno);
|
||||
if (cmd->sysinit)
|
||||
if (cmd->sysinit || cmd->ignorelockingfailure)
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
@ -2284,7 +2284,7 @@ static int _lock_devices_file(struct cmd_context *cmd, int mode, int nonblock, i
|
||||
|
||||
if (close(fd))
|
||||
stack;
|
||||
if (cmd->sysinit)
|
||||
if (cmd->sysinit || cmd->ignorelockingfailure)
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
@ -3190,6 +3190,8 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
|
||||
goto out;
|
||||
}
|
||||
|
||||
cmd->ignorelockingfailure = arg_is_set(cmd, ignorelockingfailure_ARG);
|
||||
|
||||
/* Defaults to 1 if not set. */
|
||||
locking_type = find_config_tree_int(cmd, global_locking_type_CFG, NULL);
|
||||
|
||||
@ -3224,7 +3226,7 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
|
||||
if (!_cmd_no_meta_proc(cmd))
|
||||
log_warn("WARNING: File locking is disabled.");
|
||||
} else {
|
||||
if (!init_locking(cmd, sysinit, readonly, arg_is_set(cmd, ignorelockingfailure_ARG))) {
|
||||
if (!init_locking(cmd, sysinit, readonly, cmd->ignorelockingfailure)) {
|
||||
ret = ECMD_FAILED;
|
||||
goto_out;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user