From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-1266-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 11110 invoked by alias); 22 Feb 2008 13:22:47 -0000
Received: (qmail 11093 invoked by uid 9447); 22 Feb 2008 13:22:46 -0000
Date: Fri, 22 Feb 2008 13:22:00 -0000
Message-ID: <20080222132246.11092.qmail@sourceware.org>
From: agk@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2 ./WHATS_NEW lib/metadata/merge.c
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2008-02/txt/msg00013.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2008-02-22 13:22:45

Modified files:
	.              : WHATS_NEW 
	lib/metadata   : merge.c 

Log message:
	Fix remove_layer_from_lv to empty the LV before removing it. (2.02.30)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.796&r2=1.797
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/merge.c.diff?cvsroot=lvm2&r1=1.34&r2=1.35

--- LVM2/WHATS_NEW	2008/02/22 13:22:19	1.796
+++ LVM2/WHATS_NEW	2008/02/22 13:22:44	1.797
@@ -1,5 +1,6 @@
 Version 2.02.34 -
 ===================================
+  Fix remove_layer_from_lv to empty the LV before removing it. (2.02.30)
   Add missing no-longer-used segs_using_this_lv test to check_lv_segments.
   Remove redundant non-NULL tests before calling free in clvmd.c.
   Avoid a compiler warning: make is_orphan's parameter const.
--- LVM2/lib/metadata/merge.c	2008/01/30 14:00:00	1.34
+++ LVM2/lib/metadata/merge.c	2008/02/22 13:22:44	1.35
@@ -224,6 +224,20 @@
 				  seg->le + seg->len - 1, seg_found);
 			r = 0;
 		}
+
+		seg_found = 0;
+		list_iterate_items(seg2, &seg->lv->segments)
+			if (sl->seg == seg2) {
+				seg_found++;
+				break;
+			}
+		if (!seg_found) {
+			log_error("LV segment %s:%" PRIu32 "-%" PRIu32
+				  "is incorrectly listed as being used by LV %s",
+				  seg->lv->name, seg->le, seg->le + seg->len - 1,
+				  lv->name);
+			r = 0;
+		}
 	}
 
 	if (le != lv->le_count) {