From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-3143-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 27751 invoked by alias); 25 May 2010 08:40:39 -0000
Received: (qmail 27704 invoked by uid 9737); 25 May 2010 08:40:38 -0000
Date: Tue, 25 May 2010 08:40:00 -0000
Message-ID: <20100525084038.27701.qmail@sourceware.org>
From: zkabelac@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/libdm libdm-deptree.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/msg00106.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-05-25 08:40:37

Modified files:
	libdm          : libdm-deptree.c 

Log message:
	Fix copy&paste detection of kernel release version.
	Add log_error to avoid return_0 without log_error.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-deptree.c.diff?cvsroot=lvm2&r1=1.81&r2=1.82

--- LVM2/libdm/libdm-deptree.c	2010/05/24 23:11:35	1.81
+++ LVM2/libdm/libdm-deptree.c	2010/05/25 08:40:36	1.82
@@ -1542,8 +1542,10 @@
 	const char *logtype;
 	unsigned kmaj, kmin, krel;
 
-	if (!uname(&uts) || sscanf(uts.release, "%u.%u.%u", &kmaj, &kmin, &krel) != 3)
-		return_0;
+	if (uname(&uts) == -1 || sscanf(uts.release, "%u.%u.%u", &kmaj, &kmin, &krel) != 3) {
+		log_error("Cannot read kernel release version");
+		return 0;
+	}
 
 	if ((seg->flags & DM_BLOCK_ON_ERROR)) {
 		/*