snapshot: always activate

Drop the 'cluster-only' optimization so we do resume ALL device
before we try to wait on cookie before 'removal' operation.

It's more correct order of operation - alhtough possibly slightly
less efficient - but until we have correct list of operations
'in-progress' we can't do anything better.

diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c
index 5ccf251c779a7f6c6a1b3c4956ac5fa70cc154f0..65d8dbd13f9533898a4ed6b71f13bff0d93bccab 100644 (file)
--- a/lib/metadata/snapshot_manip.c
+++ b/lib/metadata/snapshot_manip.c
@@ -361,13 +361,7 @@ int vg_remove_snapshot(struct logical_volume *cow)
                        return 0;
                }
 
-               /*
-                * 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 (vg_is_clustered(cow->vg) &&
-                   merging_snapshot && !activate_lv(cow->vg->cmd, cow)) {
+               if (merging_snapshot && !activate_lv(cow->vg->cmd, cow)) {
                        log_error("Failed to activate %s.", cow->name);
                        return 0;
                }