From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-1520-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 12237 invoked by alias); 10 Sep 2008 10:15:00 -0000
Received: (qmail 12223 invoked by uid 9664); 10 Sep 2008 10:14:59 -0000
Date: Wed, 10 Sep 2008 10:15:00 -0000
Message-ID: <20080910101459.12221.qmail@sourceware.org>
From: mbroz@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/lib/locking locking.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-09/txt/msg00000.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2008-09-10 10:14:59

Modified files:
	lib/locking    : locking.c 

Log message:
	Do not scan for lvm1 entries in /proc if not running 2.4 kernel.
	(LVM1 is only present in 2.4 kernel.)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/locking/locking.c.diff?cvsroot=lvm2&r1=1.49&r2=1.50

--- LVM2/lib/locking/locking.c	2008/05/09 18:45:15	1.49
+++ LVM2/lib/locking/locking.c	2008/09/10 10:14:59	1.50
@@ -292,6 +292,10 @@
 	if (is_orphan_vg(vgname))
 		return 1;
 
+	/* LVM1 is only present in 2.4 kernels. */
+	if (strncmp(cmd->kernel_vsn, "2.4.", 4))
+		return 1;
+
 	if (dm_snprintf(path, sizeof(path), "%s/lvm/VGs/%s", cmd->proc_dir,
 			 vgname) < 0) {
 		log_error("LVM1 proc VG pathname too long for %s", vgname);