From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-1988-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 1437 invoked by alias); 26 Jun 2009 11:29:06 -0000
Received: (qmail 1422 invoked by uid 9657); 26 Jun 2009 11:29:06 -0000
Date: Fri, 26 Jun 2009 11:29:00 -0000
Message-ID: <20090626112906.1420.qmail@sourceware.org>
From: wysochanski@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/tools lvconvert.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/msg00051.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	wysochanski@sourceware.org	2009-06-26 11:29:06

Modified files:
	tools          : lvconvert.c 

Log message:
	Fix incomplete revert for lvconvert.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvconvert.c.diff?cvsroot=lvm2&r1=1.85&r2=1.86

--- LVM2/tools/lvconvert.c	2009/06/26 10:55:58	1.85
+++ LVM2/tools/lvconvert.c	2009/06/26 11:29:06	1.86
@@ -242,8 +242,10 @@
 	/*
 	 * uuid is here LV uuid, but vg_read will use only first part.
 	 */
-	return vg_read_for_update(cmd, extract_vgname(cmd, lv_name),
-				  NULL, 0);
+        return vg_lock_and_read(cmd, extract_vgname(cmd, lv_name),
+                               uuid, LCK_VG_WRITE,
+                               CLUSTERED | EXPORTED_VG | LVM_WRITE,
+                               CORRECT_INCONSISTENT | FAIL_INCONSISTENT);
 }
 
 static struct logical_volume *_get_lvconvert_lv(struct cmd_context *cmd __attribute((unused)),