From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-4249-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 26596 invoked by alias); 5 Jul 2011 01:01:20 -0000
Received: (qmail 26578 invoked by uid 9447); 5 Jul 2011 01:01:20 -0000
Date: Tue, 05 Jul 2011 01:01:00 -0000
Message-ID: <20110705010120.26576.qmail@sourceware.org>
From: agk@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/lib/activate dev_manager.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: 2011-07/txt/msg00005.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2011-07-05 01:01:19

Modified files:
	lib/activate   : dev_manager.c 

Log message:
	Fix conditions using no_merging: only those using lv_is_merging_cow() should
	have been converted, not pure lv_is_cow ones.
	(Merging has no impact on how the pre-merged cow segment itself is loaded.)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/activate/dev_manager.c.diff?cvsroot=lvm2&r1=1.223&r2=1.224

--- LVM2/lib/activate/dev_manager.c	2011/07/04 14:56:58	1.223
+++ LVM2/lib/activate/dev_manager.c	2011/07/05 01:01:19	1.224
@@ -1436,7 +1436,7 @@
 		}
 		if (!_add_new_lv_to_dtree(dm, dtree, seg->lv, laopts, "real"))
 			return_0;
-	} else if (!laopts->no_merging && lv_is_cow(seg->lv) && !layer) {
+	} else if (lv_is_cow(seg->lv) && !layer) {
 		if (!_add_new_lv_to_dtree(dm, dtree, seg->lv, laopts, "cow"))
 			return_0;
 	} else {
@@ -1457,7 +1457,7 @@
 			if (!_add_snapshot_merge_target_to_dtree(dm, dnode, seg->lv))
 				return_0;
 		}
-	} else if (!laopts->no_merging && lv_is_cow(seg->lv) && !layer) {
+	} else if (lv_is_cow(seg->lv) && !layer) {
 		if (!_add_snapshot_target_to_dtree(dm, dnode, seg->lv, laopts))
 			return_0;
 	} else if (!_add_target_to_dtree(dm, dnode, seg, laopts))