From 93bbc31c832868ec737b02f51f884f1825b0c1e7 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Tue, 29 Sep 2009 20:22:35 +0000
Subject: [PATCH] Don't attempt to restart pvmoves when deactivating LVs in
 vgchange. Restart lvconverts in vgchange by sharing
 lv_spawn_background_polling.

---
 WHATS_NEW        |  2 ++
 tools/lvchange.c | 14 +-------------
 tools/toollib.c  | 19 +++++++++++++++++++
 tools/toollib.h  |  3 +++
 tools/vgchange.c | 10 +++-------
 5 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/WHATS_NEW b/WHATS_NEW
index 10c899b05..2be4abb70 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,7 @@
 Version 2.02.54 -
 =====================================
+  Don't attempt to restart pvmoves when deactivating LVs in vgchange.
+  Restart lvconverts in vgchange by sharing lv_spawn_background_polling.
   Generalise polldaemon code by changing mirror-specific variable names.
   Don't attempt to deactivate an LV if any of its snapshots are in use.
   Return fail if lv_deactivate fails to remove device from kernel.
diff --git a/tools/lvchange.c b/tools/lvchange.c
index b9be0c2a1..db22cadce 100644
--- a/tools/lvchange.c
+++ b/tools/lvchange.c
@@ -105,7 +105,6 @@ static int lvchange_availability(struct cmd_context *cmd,
 				 struct logical_volume *lv)
 {
 	int activate;
-	const char *pvname;
 
 	activate = arg_uint_value(cmd, available_ARG, 0);
 
@@ -136,18 +135,7 @@ static int lvchange_availability(struct cmd_context *cmd,
 				return_0;
 		}
 
-		if ((lv->status & LOCKED) &&
-		    (pvname = get_pvmove_pvname_from_lv(lv))) {
-			log_verbose("Spawning background pvmove process for %s",
-				    pvname);
-			pvmove_poll(cmd, pvname, 1);
-		}
-
-		if (lv->status & CONVERTING) {
-			log_verbose("Spawning background lvconvert process for %s",
-				    lv->name);
-			lvconvert_poll(cmd, lv, 1);
-		}
+		lv_spawn_background_polling(cmd, lv);
 	}
 
 	return 1;
diff --git a/tools/toollib.c b/tools/toollib.c
index afecaea80..ed38e188e 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -1247,3 +1247,22 @@ int vg_refresh_visible(struct cmd_context *cmd, struct volume_group *vg)
 	
 	return r;
 }
+
+void lv_spawn_background_polling(struct cmd_context *cmd,
+				 struct logical_volume *lv)
+{
+	const char *pvname;
+
+	if ((lv->status & LOCKED) &&
+	    (pvname = get_pvmove_pvname_from_lv(lv))) {
+		log_verbose("Spawning background pvmove process for %s",
+			    pvname);
+		pvmove_poll(cmd, pvname, 1);
+	}
+
+	if (lv->status & CONVERTING) {
+		log_verbose("Spawning background lvconvert process for %s",
+			lv->name);
+		lvconvert_poll(cmd, lv, 1);
+	}
+}
diff --git a/tools/toollib.h b/tools/toollib.h
index 273cb65fb..59cbeb6cc 100644
--- a/tools/toollib.h
+++ b/tools/toollib.h
@@ -105,4 +105,7 @@ int fill_vg_create_params(struct cmd_context *cmd,
 
 int lv_refresh(struct cmd_context *cmd, struct logical_volume *lv);
 int vg_refresh_visible(struct cmd_context *cmd, struct volume_group *vg);
+void lv_spawn_background_polling(struct cmd_context *cmd,
+				 struct logical_volume *lv);
+
 #endif
diff --git a/tools/vgchange.c b/tools/vgchange.c
index 95b0b48ca..cef19c06e 100644
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -91,13 +91,9 @@ static int _activate_lvs_in_vg(struct cmd_context *cmd,
 		} else if (!activate_lv(cmd, lv))
 			continue;
 
-		if ((lv->status & PVMOVE) &&
-		    (pvname = get_pvmove_pvname_from_lv_mirr(lv))) {
-			log_verbose("Spawning background process for %s %s",
-				    lv->name, pvname);
-			pvmove_poll(cmd, pvname, 1);
-			continue;
-		}
+		if (activate != CHANGE_AN && activate != CHANGE_ALN &&
+		    (lv->status & (PVMOVE|CONVERTING)))
+			lv_spawn_background_polling(cmd, lv);
 
 		count++;
 	}
-- 
2.43.5