shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-10-28 03:27:58 +03:00
Code Releases Activity

Reload origin if merging has stopped.

Browse Source
This commit is contained in:
Mike Snitzer 2010-01-13 01:51:45 +00:00
parent df06d9ac7a
commit 3a8d01b6e1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/metadata/lv_manip.c
View File

@ -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))