diff options
| author | Milan Broz <mbroz@redhat.com> | 2009-06-05 20:00:52 +0000 |
|---|---|---|
| committer | Milan Broz <mbroz@redhat.com> | 2009-06-05 20:00:52 +0000 |
| commit | 66086ce962c17a86bf6a1e984d716ef71b7b3441 (patch) | |
| tree | fd6d398a3567ebd6a03af3d21de5778c6bdb7e61 /tools/vgdisplay.c | |
| parent | 89b7d5cb4c2ebfc0a045a69902257785db3f5b27 (diff) | |
| download | lvm2-66086ce962c17a86bf6a1e984d716ef71b7b3441.tar.gz | |
Fix double releasing of vg when repairing of vg is requested.
Several commands calls process_each_vg() and in provided
callback it explicitly recovers VG if inconsistent.
(vgchange, vgconvert, vgscan)
It means that old VG is released and reread but the function
above (process_one_vg) tries to unlock and release old VG.
Patch moves the repair logic into _process_one_vg() function.
It always tries to read vg (even inconsistent) and then decides
what to do according new defined parameter.
Also patch unifies inconsistent error messages.
The only slight change if for vgremove command, where
it now tries to repair VG before it removes if force arg is given.
(It works similar way before, just the order of operation changed).
Diffstat (limited to 'tools/vgdisplay.c')
| -rw-r--r-- | tools/vgdisplay.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tools/vgdisplay.c b/tools/vgdisplay.c index 02fdc19d6..de38d8b85 100644 --- a/tools/vgdisplay.c +++ b/tools/vgdisplay.c @@ -20,13 +20,6 @@ static int vgdisplay_single(struct cmd_context *cmd, const char *vg_name, void *handle __attribute((unused))) { /* FIXME Do the active check here if activevolumegroups_ARG ? */ - if (!vg) { - log_error("Volume group \"%s\" doesn't exist", vg_name); - return ECMD_FAILED; - } - - if (!consistent) - log_error("WARNING: Volume group \"%s\" inconsistent", vg_name); vg_check_status(vg, EXPORTED_VG); @@ -98,7 +91,8 @@ int vgdisplay(struct cmd_context *cmd, int argc, char **argv) } **********/ - return process_each_vg(cmd, argc, argv, LCK_VG_READ, 0, NULL, + return process_each_vg(cmd, argc, argv, LCK_VG_READ, + VG_INCONSISTENT_CONTINUE, NULL, vgdisplay_single); /******** FIXME Need to count number processed |