From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4289 invoked by alias); 13 Jan 2010 01:51:46 -0000 Received: (qmail 4275 invoked by uid 9805); 13 Jan 2010 01:51:46 -0000 Date: Wed, 13 Jan 2010 01:51:00 -0000 Message-ID: <20100113015146.4273.qmail@sourceware.org> From: snitzer@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/lib/metadata lv_manip.c Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2010-01/txt/msg00073.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: snitzer@sourceware.org 2010-01-13 01:51:45 Modified files: lib/metadata : lv_manip.c Log message: Reload origin if merging has stopped. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv_manip.c.diff?cvsroot=lvm2&r1=1.198&r2=1.199 --- LVM2/lib/metadata/lv_manip.c 2010/01/13 01:35:49 1.198 +++ LVM2/lib/metadata/lv_manip.c 2010/01/13 01:51:45 1.199 @@ -2065,6 +2065,7 @@ struct volume_group *vg; struct lvinfo info; struct logical_volume *origin = NULL; + int was_merging = 0; vg = lv->vg; @@ -2126,6 +2127,7 @@ 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 @@ 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))