From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-2648-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 29142 invoked by alias); 15 Jan 2010 17:46:08 -0000
Received: (qmail 29128 invoked by uid 9805); 15 Jan 2010 17:46:08 -0000
Date: Fri, 15 Jan 2010 17:46:00 -0000
Message-ID: <20100115174608.29126.qmail@sourceware.org>
From: snitzer@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/lib/snapshot snapshot.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: 2010-01/txt/msg00095.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	snitzer@sourceware.org	2010-01-15 17:46:08

Modified files:
	lib/snapshot   : snapshot.c 

Log message:
	Detect case of both merging_store and cow_store supplied in
	_snap_text_import().

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/snapshot/snapshot.c.diff?cvsroot=lvm2&r1=1.44&r2=1.45

--- LVM2/lib/snapshot/snapshot.c	2010/01/15 16:35:26	1.44
+++ LVM2/lib/snapshot/snapshot.c	2010/01/15 17:46:08	1.45
@@ -46,9 +46,14 @@
 
 	old_suppress = log_suppress(1);
 
-	/* FIXME Detect case of both merging_store and cow_store supplied */
-	if ((cow_name = find_config_str(sn, "merging_store", NULL)))
+	if ((cow_name = find_config_str(sn, "merging_store", NULL))) {
+		if (find_config_str(sn, "cow_store", NULL)) {
+			log_suppress(old_suppress);
+			log_error("Both snapshot cow and merging storage were specified.");
+			return 0;
+		}
 		merge = 1;
+	}
 	else if (!(cow_name = find_config_str(sn, "cow_store", NULL))) {
 		log_suppress(old_suppress);
 		log_error("Snapshot cow storage not specified.");