From 3a8d01b6e1438692d0aed30d8ffd8e66024dda15 Mon Sep 17 00:00:00 2001 From: Mike Snitzer Date: Wed, 13 Jan 2010 01:51:45 +0000 Subject: [PATCH] Reload origin if merging has stopped. --- lib/metadata/lv_manip.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 8fcbae5f0..937412563 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -2065,6 +2065,7 @@ int lv_remove_single(struct cmd_context *cmd, struct logical_volume *lv, struct volume_group *vg; struct lvinfo info; struct logical_volume *origin = NULL; + int was_merging = 0; vg = lv->vg; @@ -2126,6 +2127,7 @@ int lv_remove_single(struct cmd_context *cmd, struct logical_volume *lv, if (lv_is_cow(lv)) { origin = origin_from_cow(lv); + was_merging = !!origin->merging_snapshot; log_verbose("Removing snapshot %s", lv->name); if (!vg_remove_snapshot(lv)) return_0; @@ -2143,8 +2145,8 @@ int lv_remove_single(struct cmd_context *cmd, struct logical_volume *lv, backup(vg); - /* If no snapshots left, reload without -real. */ - if (origin && !lv_is_origin(origin)) { + /* If no snapshots left or if we stopped merging, reload */ + if (origin && (!lv_is_origin(origin) || was_merging)) { if (!suspend_lv(cmd, origin)) log_error("Failed to refresh %s without snapshot.", origin->name); else if (!resume_lv(cmd, origin)) -- 2.43.5