Fix code that performs RAID device replacement while under snapshot.

The code should have been calling [suspend|resume]_lv_origin() rather than
[suspend|resume]_lv.

This addresses bug 807069.

diff --git a/WHATS_NEW b/WHATS_NEW
index 2e0153e71b924f6b6e1e72d9c55003946b6dd07e..6a3f0a2943f23a23b634fadd733ac00606193104 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.96 - 
 ================================
+  Fix RAID device replacement code so that it works under snapshot.
   Fix inability to split RAID1 image while specifying a particular PV.
   Update man pages to give them same look&feel.
   Fix lvresize of thin pool for stipped devices.

diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index d6f12e30cebe2d69482db004859b1ce5941a2f84..3df043fe31c0fdc9b33f1b6c12f5e9557c37c0b7 100644 (file)
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -1713,7 +1713,7 @@ int lv_raid_replace(struct logical_volume *lv,
                return 0;
        }
 
-       if (!suspend_lv(lv->vg->cmd, lv)) {
+       if (!suspend_lv_origin(lv->vg->cmd, lv)) {
                log_error("Failed to suspend %s/%s before committing changes",
                          lv->vg->name, lv->name);
                return 0;
@@ -1725,7 +1725,7 @@ int lv_raid_replace(struct logical_volume *lv,
                return 0;
        }
 
-       if (!resume_lv(lv->vg->cmd, lv)) {
+       if (!resume_lv_origin(lv->vg->cmd, lv)) {
                log_error("Failed to resume %s/%s after committing changes",
                          lv->vg->name, lv->name);
                return 0;
@@ -1761,7 +1761,7 @@ int lv_raid_replace(struct logical_volume *lv,
                return 0;
        }
 
-       if (!suspend_lv(lv->vg->cmd, lv)) {
+       if (!suspend_lv_origin(lv->vg->cmd, lv)) {
                log_error("Failed to suspend %s/%s before committing changes",
                          lv->vg->name, lv->name);
                return 0;
@@ -1773,7 +1773,7 @@ int lv_raid_replace(struct logical_volume *lv,
                return 0;
        }
 
-       if (!resume_lv(lv->vg->cmd, lv)) {
+       if (!resume_lv_origin(lv->vg->cmd, lv)) {
                log_error("Failed to resume %s/%s after committing changes",
                          lv->vg->name, lv->name);
                return 0;