shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

pvscan: code reshape

Browse Source
This commit is contained in:
Zdenek Kabelac 2018-06-14 21:07:15 +02:00
parent 33703995ae
commit 752c39d91d
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/pvscan.c
View File

@ -318,21 +318,22 @@ static int _pvscan_cache(struct cmd_context *cmd, int argc, char **argv)
dm_list_init(&found_vgnames);
dm_list_init(&pp.changed_vgnames);
do_activate = arg_is_set(cmd, activate_ARG);
if ((do_activate = arg_is_set(cmd, activate_ARG))) {
if (arg_uint_value(cmd, activate_ARG, 0) != CHANGE_AAY) {
log_error("Only --activate ay allowed with pvscan.");
return EINVALID_CMD_LINE;
}
if (!lvmetad_used() && !do_activate) {
log_verbose("Ignoring pvscan --cache because lvmetad is not in use.");
return ret;
}
if (do_activate && (arg_uint_value(cmd, activate_ARG, CHANGE_AAY) != CHANGE_AAY)) {
log_error("Only --activate ay allowed with pvscan.");
return 0;
}
if (!lvmetad_used() && do_activate && !find_config_tree_bool(cmd, global_use_lvmetad_CFG, NULL)) {
log_verbose("Ignoring pvscan --cache -aay because lvmetad is not in use.");
return ret;
if (!lvmetad_used() &&
!find_config_tree_bool(cmd, global_use_lvmetad_CFG, NULL)) {
log_verbose("Ignoring pvscan --cache -aay because lvmetad is not in use.");
return ret;
}
} else {
if (!lvmetad_used()) {
log_verbose("Ignoring pvscan --cache because lvmetad is not in use.");
return ret;
}
}
if (arg_is_set(cmd, major_ARG) + arg_is_set(cmd, minor_ARG))