From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-2796-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 1327 invoked by alias); 16 Mar 2010 19:06:59 -0000
Received: (qmail 1313 invoked by uid 9447); 16 Mar 2010 19:06:58 -0000
Date: Tue, 16 Mar 2010 19:06:00 -0000
Message-ID: <20100316190658.1311.qmail@sourceware.org>
From: agk@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/lib/cache lvmcache.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-03/txt/msg00035.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2010-03-16 19:06:58

Modified files:
	lib/cache      : lvmcache.c 

Log message:
	fix last checkin

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/cache/lvmcache.c.diff?cvsroot=lvm2&r1=1.80&r2=1.81

--- LVM2/lib/cache/lvmcache.c	2010/03/16 17:30:01	1.80
+++ LVM2/lib/cache/lvmcache.c	2010/03/16 19:06:57	1.81
@@ -605,9 +605,9 @@
 	    (!precommitted && vginfo->precommitted && !memlock()))
 		return NULL;
 
-	if (!(fid =  vginfo->fmt->ops->create_instance(vginfo->fmt,
-						       vginfo->vgname,
-						       vgid, NULL)))
+	if (!(fid = vginfo->fmt->ops->create_instance(vginfo->fmt,
+						      vginfo->vgname,
+						      vgid, NULL)))
 		return_NULL;
 
 	if (!(vg = import_vg_from_buffer(vginfo->vgmetadata, fid)) ||
@@ -733,7 +733,8 @@
 		return NULL;
 
 	lvmcache_label_scan(cmd, 2);
-	*scan_done_once = 1;
+	if (scan_done_once)
+		*scan_done_once = 1;
 
 	/* Try again */
 	if ((info = info_from_pvid((char *) pvid, 0))) {