snapshot: update merging fix

Activation is needed only for clustered VG.
For non-clustered VG skip activation, since deactivate_lv()
is called without problems (no testing for lock presence).

(updates f6ded62291682e40c7976d27e48915d9d1538940)

diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c
index ab28890a2885264d4b59625950c4c0fba87439f1..325a4e8c3de25186a88d2983ed3ce72964bb3b1f 100644 (file)
--- a/lib/metadata/snapshot_manip.c
+++ b/lib/metadata/snapshot_manip.c
@@ -298,10 +298,12 @@ int vg_remove_snapshot(struct logical_volume *cow)
                }
 
                /*
-                * For merged snapshot we activate cow so it can clean
-                * left table entries and deactivate_lv() follows shortly.
+                * For merged snapshot and clustered VG activate cow LV so
+                * the following call to deactivate_lv() can clean-up table
+                * entries. For this clustered lock need to be held.
                 */
-               if (merging_snapshot && !activate_lv(cow->vg->cmd, cow)) {
+               if (vg_is_clustered(cow->vg) &&
+                   merging_snapshot && !activate_lv(cow->vg->cmd, cow)) {
                        log_error("Failed to activate %s.", cow->name);
                        return 0;
                }