diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2019-08-26 15:13:55 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2019-08-26 15:23:44 +0200 |
| commit | af0b84ccc850d619eddef5112753731abce099ed (patch) | |
| tree | 17ca7eee88e9bbeb7a88805a90b7b8ba2bfafb96 | |
| parent | 7833c45fbe79e49ac22e50b90917b7d7ff2d78ac (diff) | |
| download | lvm2-af0b84ccc850d619eddef5112753731abce099ed.tar.gz | |
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.
| -rw-r--r-- | lib/metadata/snapshot_manip.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c index 5ccf251c7..65d8dbd13 100644 --- 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; } |