From 0c8b215a60953f9388ba7f44fae0f4fb8e457712 Mon Sep 17 00:00:00 2001
From: Dave Wysochanski <dwysocha@redhat.com>
Date: Mon, 23 Jul 2007 22:20:42 +0000
Subject: [PATCH] Update lvconvert and lvrename to use vg_lock_and_read

---
 tools/lvconvert.c | 15 +++------------
 tools/lvrename.c  | 15 +++------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index aeb01c6ea..a243f2377 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -534,7 +534,6 @@ static int lvconvert_single(struct cmd_context *cmd, struct logical_volume *lv,
 
 int lvconvert(struct cmd_context * cmd, int argc, char **argv)
 {
-	int consistent = 1;
 	struct volume_group *vg;
 	struct lv_list *lvl;
 	struct lvconvert_params lp;
@@ -547,18 +546,10 @@ int lvconvert(struct cmd_context * cmd, int argc, char **argv)
 
 	log_verbose("Checking for existing volume group \"%s\"", lp.vg_name);
 
-	if (!lock_vol(cmd, lp.vg_name, LCK_VG_WRITE)) {
-		log_error("Can't get lock for %s", lp.vg_name);
+	if (!(vg = vg_lock_and_read(cmd, lp.vg_name, LCK_VG_WRITE,
+				    CLUSTERED | EXPORTED_VG | LVM_WRITE,
+				    CORRECT_INCONSISTENT)))
 		return ECMD_FAILED;
-	}
-
-	if (!(vg = vg_read(cmd, lp.vg_name, NULL, &consistent))) {
-		log_error("Volume group \"%s\" doesn't exist", lp.vg_name);
-		goto error;
-	}
-
-	if (!vg_check_status(vg, CLUSTERED | EXPORTED_VG | LVM_WRITE))
-		goto error;
 
 	if (!(lvl = find_lv_in_vg(vg, lp.lv_name))) {
 		log_error("Logical volume \"%s\" not found in "
diff --git a/tools/lvrename.c b/tools/lvrename.c
index 211930733..450d712f7 100644
--- a/tools/lvrename.c
+++ b/tools/lvrename.c
@@ -22,7 +22,6 @@ int lvrename(struct cmd_context *cmd, int argc, char **argv)
 	char *lv_name_old, *lv_name_new;
 	const char *vg_name, *vg_name_new, *vg_name_old;
 	char *st;
-	int consistent = 1;
 
 	struct volume_group *vg;
 	struct logical_volume *lv;
@@ -99,18 +98,10 @@ int lvrename(struct cmd_context *cmd, int argc, char **argv)
 
 	log_verbose("Checking for existing volume group \"%s\"", vg_name);
 
-	if (!lock_vol(cmd, vg_name, LCK_VG_WRITE)) {
-		log_error("Can't get lock for %s", vg_name);
+	if (!(vg = vg_lock_and_read(cmd, vg_name, LCK_VG_WRITE,
+				    CLUSTERED | EXPORTED_VG | LVM_WRITE,
+				    CORRECT_INCONSISTENT)))
 		return ECMD_FAILED;
-	}
-
-	if (!(vg = vg_read(cmd, vg_name, NULL, &consistent))) {
-		log_error("Volume group \"%s\" doesn't exist", vg_name);
-		goto error;
-	}
-
-	if (!vg_check_status(vg, CLUSTERED | EXPORTED_VG | LVM_WRITE))
-		goto error;
 
 	if (find_lv_in_vg(vg, lv_name_new)) {
 		log_error("Logical volume \"%s\" already exists in "