Add some missing vg_revrts calls when pvmove aborts.

diff --git a/WHATS_NEW b/WHATS_NEW
index cc5fe2243e2f75588b8f7fafca003c773a35efbc..a5092f614280b4eb4f50faab2ab2d64bf065436d 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.60 - 23rd January 2010
 ===================================
+  Add missing metadata reverts in pvmove error path.
   Unlock shared lock in clvmd if activation calls failed.
   Fix return code of info call for query by uuid.
   Extend cmirrord man page.

diff --git a/tools/pvmove.c b/tools/pvmove.c
index 47982e62a8b6556b28f667cef5433d90b8ebf8e5..a286db16d7bb90da106057f223d5668e15d6f89f 100644 (file)
--- a/tools/pvmove.c
+++ b/tools/pvmove.c
@@ -303,8 +303,10 @@ static int _update_metadata(struct cmd_context *cmd, struct volume_group *vg,
        }
 
        /* Suspend lvs_changed */
-       if (!suspend_lvs(cmd, lvs_changed))
+       if (!suspend_lvs(cmd, lvs_changed)) {
+               vg_revert(vg);
                goto_out;
+       }
 
        /* Suspend mirrors on subsequent calls */
        if (!first_time) {
@@ -324,6 +326,7 @@ static int _update_metadata(struct cmd_context *cmd, struct volume_group *vg,
                                stack;
                if (!resume_lvs(cmd, lvs_changed))
                        stack;
+               vg_revert(vg);
                goto out;
        }