From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-3073-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 1928 invoked by alias); 14 May 2010 12:39:53 -0000
Received: (qmail 1914 invoked by uid 9664); 14 May 2010 12:39:53 -0000
Date: Fri, 14 May 2010 12:39:00 -0000
Message-ID: <20100514123953.1912.qmail@sourceware.org>
From: mbroz@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: 2010-05/txt/msg00036.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2010-05-14 12:39:52

Modified files:
	lib/activate   : dev_manager.c 

Log message:
	Another one internal device layer fix...

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

--- LVM2/lib/activate/dev_manager.c	2010/05/14 12:30:43	1.190
+++ LVM2/lib/activate/dev_manager.c	2010/05/14 12:39:52	1.191
@@ -180,10 +180,9 @@
 		    !dm_split_lvm_name(NULL, NULL, &vgname, &lvname, &layer))
 			goto_out;
 
-		if (lvname && (is_reserved_lvname(lvname) || (layer && *layer))) {
+		if (lvname && (is_reserved_lvname(lvname) || *layer)) {
 			log_debug("%s: Reserved internal LV device %s/%s%s%s not usable.",
-				  dev_name(dev), vgname, lvname, layer ? "-" : "",
-				  layer ?: "");
+				  dev_name(dev), vgname, lvname, *layer ? "-" : "", layer);
 			goto out;
 		}
 	}