shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

pvchange, pvresize: move exported VG check

Browse Source 
Allow pvchange and pvresize to process exported VGs,
and have them check for the exported state in their
single function.

Previously, the exported VG state would trigger a
failure in vg_read()/ignore_vg() because the VGs are
being read with READ_FOR_UPDATE.  Because these commands
read all VGs to search for the intended PVs, any
exported VG would trigger a failure, even if it was
not related to the intended PV.
This commit is contained in:
David Teigland 2016-03-10 13:28:47 -06:00
parent 9f4451193b
commit 0f10823ec9
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/pvchange.c
View File

@ -35,6 +35,11 @@ static int _pvchange_single(struct cmd_context *cmd, struct volume_group *vg,
params->total++;
if (vg && vg_is_exported(vg)) {
log_error("Volume group %s is exported", vg->name);
goto bad;
}
/* If in a VG, must change using volume group. */
if (!is_orphan(pv)) {
if (tagargs && !(vg->fid->fmt->features & FMT_TAGS)) {
@ -230,7 +235,7 @@ int pvchange(struct cmd_context *cmd, int argc, char **argv)
set_pv_notify(cmd);
ret = process_each_pv(cmd, argc, argv, NULL, 0, READ_FOR_UPDATE, handle, _pvchange_single);
ret = process_each_pv(cmd, argc, argv, NULL, 0, READ_FOR_UPDATE | READ_ALLOW_EXPORTED, handle, _pvchange_single);
if (!argc)
unlock_vg(cmd, VG_GLOBAL);

8
tools/pvresize.c
View File

@ -36,6 +36,11 @@ static int _pvresize_single(struct cmd_context *cmd,
}
params->total++;
if (vg && vg_is_exported(vg)) {
log_error("Volume group %s is exported", vg->name);
return ECMD_FAILED;
}
/*
* Needed to change a property on an orphan PV.
* i.e. the global lock is only needed for orphans.
@ -89,8 +94,7 @@ int pvresize(struct cmd_context *cmd, int argc, char **argv)
handle->custom_handle = &params;
ret = process_each_pv(cmd, argc, argv, NULL, 0, READ_FOR_UPDATE, handle,
_pvresize_single);
ret = process_each_pv(cmd, argc, argv, NULL, 0, READ_FOR_UPDATE | READ_ALLOW_EXPORTED, handle, _pvresize_single);
log_print_unless_silent("%d physical volume(s) resized / %d physical volume(s) "
"not resized", params.done, params.total - params.done);