From: Milan Broz <mbroz@redhat.com>
Date: Tue, 26 Jan 2010 08:01:18 +0000 (+0000)
Subject: Add some missing vg_revrts calls when pvmove aborts.
X-Git-Tag: old-v2_02_61~38
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=aef0a988400d8509cb072f0507087f3878e8e3ca;p=lvm2.git

Add some missing vg_revrts calls when pvmove aborts.
---

diff --git a/WHATS_NEW b/WHATS_NEW
index cc5fe2243..a5092f614 100644
--- 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 47982e62a..a286db16d 100644
--- 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;
 	}