summaryrefslogtreecommitdiffstats
path: root/tools/vgcfgbackup.c
diff options
context:
space:
mode:
authorMilan Broz <mbroz@redhat.com>2009-06-05 20:00:52 +0000
committerMilan Broz <mbroz@redhat.com>2009-06-05 20:00:52 +0000
commit66086ce962c17a86bf6a1e984d716ef71b7b3441 (patch)
treefd6d398a3567ebd6a03af3d21de5778c6bdb7e61 /tools/vgcfgbackup.c
parent89b7d5cb4c2ebfc0a045a69902257785db3f5b27 (diff)
downloadlvm2-66086ce962c17a86bf6a1e984d716ef71b7b3441.tar.gz
lvm2-66086ce962c17a86bf6a1e984d716ef71b7b3441.tar.xz
lvm2-66086ce962c17a86bf6a1e984d716ef71b7b3441.zip
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/vgcfgbackup.c')
-rw-r--r--tools/vgcfgbackup.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/tools/vgcfgbackup.c b/tools/vgcfgbackup.c
index 7a67e6a3..2d77e650 100644
--- a/tools/vgcfgbackup.c
+++ b/tools/vgcfgbackup.c
@@ -54,14 +54,6 @@ static int vg_backup_single(struct cmd_context *cmd, const char *vg_name,
char **last_filename = (char **)handle;
char *filename;
- if (!vg) {
- log_error("Volume group \"%s\" not found", vg_name);
- return ECMD_FAILED;
- }
-
- if (!consistent)
- log_error("WARNING: Volume group \"%s\" inconsistent", vg_name);
-
if (arg_count(cmd, file_ARG)) {
if (!(filename = _expand_filename(arg_value(cmd, file_ARG),
vg->name, last_filename))) {
@@ -98,8 +90,9 @@ int vgcfgbackup(struct cmd_context *cmd, int argc, char **argv)
init_pvmove(1);
- ret = process_each_vg(cmd, argc, argv, LCK_VG_READ, 0, &last_filename,
- &vg_backup_single);
+ ret = process_each_vg(cmd, argc, argv, LCK_VG_READ,
+ VG_INCONSISTENT_CONTINUE,
+ &last_filename, &vg_backup_single);
dm_free(last_filename);