From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-1964-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 12941 invoked by alias); 10 Jun 2009 10:15:29 -0000
Received: (qmail 12926 invoked by uid 9664); 10 Jun 2009 10:15:29 -0000
Date: Wed, 10 Jun 2009 10:15:00 -0000
Message-ID: <20090610101529.12924.qmail@sourceware.org>
From: mbroz@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/tools toollib.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: 2009-06/txt/msg00027.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2009-06-10 10:15:29

Modified files:
	tools          : toollib.c 

Log message:
	Unlock vg when requested automatic update failed.
	
	(fixes previous commit)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/toollib.c.diff?cvsroot=lvm2&r1=1.156&r2=1.157

--- LVM2/tools/toollib.c	2009/06/05 20:00:52	1.156
+++ LVM2/tools/toollib.c	2009/06/10 10:15:28	1.157
@@ -497,8 +497,10 @@
 			unlock_and_release_vg(cmd, vg, vg_name);
 			dev_close_all();
 			log_error("Volume group %s inconsistent", vg_name);
-			if (!(vg = recover_vg(cmd, vg_name, LCK_VG_WRITE)))
+			if (!(vg = recover_vg(cmd, vg_name, LCK_VG_WRITE))) {
+				unlock_vg(cmd, vg_name);
 				return ECMD_FAILED;
+			}
 			consistent = 1;
 			break;
 		}