From 9c9e30cd6d97089aa7ee6e16c553edc7c3a43988 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Mon, 3 Oct 2005 18:16:44 +0000
Subject: [PATCH] Use ORPHAN lock definition throughout.

---
 WHATS_NEW        |  1 +
 tools/pvcreate.c | 10 +++++-----
 tools/pvremove.c |  6 +++---
 tools/vgcreate.c | 10 +++++-----
 tools/vgextend.c |  8 ++++----
 tools/vgremove.c |  4 ++--
 6 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/WHATS_NEW b/WHATS_NEW
index cfd24d898..62dad093b 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.01.15 - 
 =================================
+  Use ORPHAN lock definition throughout.
   Validate chunksize in lvcreate.
   Reduce chunksize limit to 512k.
   Fix chunksize field in reports.
diff --git a/tools/pvcreate.c b/tools/pvcreate.c
index 1bd40ac04..a0b7807a0 100644
--- a/tools/pvcreate.c
+++ b/tools/pvcreate.c
@@ -62,13 +62,13 @@ static int pvcreate_check(struct cmd_context *cmd, const char *name)
 
 	/* Is there an md superblock here? */
 	if (!dev && md_filtering()) {
-		unlock_vg(cmd, "");
+		unlock_vg(cmd, ORPHAN);
 
 		persistent_filter_wipe(cmd->filter);
 		lvmcache_destroy();
 
 		init_md_filtering(0);
-		if (!lock_vol(cmd, "", LCK_VG_WRITE)) {
+		if (!lock_vol(cmd, ORPHAN, LCK_VG_WRITE)) {
 			log_error("Can't get lock for orphan PVs");
 			init_md_filtering(1);
 			return 0;
@@ -158,7 +158,7 @@ static int pvcreate_single(struct cmd_context *cmd, const char *pv_name,
 		extent_count = existing_pv->pe_count;
 	}
 
-	if (!lock_vol(cmd, "", LCK_VG_WRITE)) {
+	if (!lock_vol(cmd, ORPHAN, LCK_VG_WRITE)) {
 		log_error("Can't get lock for orphan PVs");
 		return ECMD_FAILED;
 	}
@@ -233,11 +233,11 @@ static int pvcreate_single(struct cmd_context *cmd, const char *pv_name,
 
 	log_print("Physical volume \"%s\" successfully created", pv_name);
 
-	unlock_vg(cmd, "");
+	unlock_vg(cmd, ORPHAN);
 	return ECMD_PROCESSED;
 
       error:
-	unlock_vg(cmd, "");
+	unlock_vg(cmd, ORPHAN);
 	return ECMD_FAILED;
 }
 
diff --git a/tools/pvremove.c b/tools/pvremove.c
index fa1d99da2..6fd9daa08 100644
--- a/tools/pvremove.c
+++ b/tools/pvremove.c
@@ -72,7 +72,7 @@ static int pvremove_single(struct cmd_context *cmd, const char *pv_name,
 {
 	struct device *dev;
 
-	if (!lock_vol(cmd, "", LCK_VG_WRITE)) {
+	if (!lock_vol(cmd, ORPHAN, LCK_VG_WRITE)) {
 		log_error("Can't get lock for orphan PVs");
 		return ECMD_FAILED;
 	}
@@ -95,11 +95,11 @@ static int pvremove_single(struct cmd_context *cmd, const char *pv_name,
 	log_print("Labels on physical volume \"%s\" successfully wiped",
 		  pv_name);
 
-	unlock_vg(cmd, "");
+	unlock_vg(cmd, ORPHAN);
 	return ECMD_PROCESSED;
 
       error:
-	unlock_vg(cmd, "");
+	unlock_vg(cmd, ORPHAN);
 	return ECMD_FAILED;
 }
 
diff --git a/tools/vgcreate.c b/tools/vgcreate.c
index ee2b8cd50..d7ca9ff2c 100644
--- a/tools/vgcreate.c
+++ b/tools/vgcreate.c
@@ -135,32 +135,32 @@ int vgcreate(struct cmd_context *cmd, int argc, char **argv)
 	else
 		vg->status &= ~CLUSTERED;
 
-	if (!lock_vol(cmd, "", LCK_VG_WRITE)) {
+	if (!lock_vol(cmd, ORPHAN, LCK_VG_WRITE)) {
 		log_error("Can't get lock for orphan PVs");
 		return ECMD_FAILED;
 	}
 
 	if (!lock_vol(cmd, vg_name, LCK_VG_WRITE | LCK_NONBLOCK)) {
 		log_error("Can't get lock for %s", vg_name);
-		unlock_vg(cmd, "");
+		unlock_vg(cmd, ORPHAN);
 		return ECMD_FAILED;
 	}
 
 	if (!archive(vg)) {
 		unlock_vg(cmd, vg_name);
-		unlock_vg(cmd, "");
+		unlock_vg(cmd, ORPHAN);
 		return ECMD_FAILED;
 	}
 
 	/* Store VG on disk(s) */
 	if (!vg_write(vg) || !vg_commit(vg)) {
 		unlock_vg(cmd, vg_name);
-		unlock_vg(cmd, "");
+		unlock_vg(cmd, ORPHAN);
 		return ECMD_FAILED;
 	}
 
 	unlock_vg(cmd, vg_name);
-	unlock_vg(cmd, "");
+	unlock_vg(cmd, ORPHAN);
 
 	backup(vg);
 
diff --git a/tools/vgextend.c b/tools/vgextend.c
index 701a10f6c..8ad7bede0 100644
--- a/tools/vgextend.c
+++ b/tools/vgextend.c
@@ -36,14 +36,14 @@ int vgextend(struct cmd_context *cmd, int argc, char **argv)
 	argc--;
 	argv++;
 
-	if (!lock_vol(cmd, "", LCK_VG_WRITE)) {
+	if (!lock_vol(cmd, ORPHAN, LCK_VG_WRITE)) {
 		log_error("Can't get lock for orphan PVs");
 		return ECMD_FAILED;
 	}
 
 	log_verbose("Checking for volume group \"%s\"", vg_name);
 	if (!lock_vol(cmd, vg_name, LCK_VG_WRITE | LCK_NONBLOCK)) {
-		unlock_vg(cmd, "");
+		unlock_vg(cmd, ORPHAN);
 		log_error("Can't get lock for %s", vg_name);
 		goto error;
 	}
@@ -93,7 +93,7 @@ int vgextend(struct cmd_context *cmd, int argc, char **argv)
 	backup(vg);
 
 	unlock_vg(cmd, vg_name);
-	unlock_vg(cmd, "");
+	unlock_vg(cmd, ORPHAN);
 
 	log_print("Volume group \"%s\" successfully extended", vg_name);
 
@@ -101,6 +101,6 @@ int vgextend(struct cmd_context *cmd, int argc, char **argv)
 
       error:
 	unlock_vg(cmd, vg_name);
-	unlock_vg(cmd, "");
+	unlock_vg(cmd, ORPHAN);
 	return ECMD_FAILED;
 }
diff --git a/tools/vgremove.c b/tools/vgremove.c
index 04dc7d614..f68d892c8 100644
--- a/tools/vgremove.c
+++ b/tools/vgremove.c
@@ -87,7 +87,7 @@ int vgremove(struct cmd_context *cmd, int argc, char **argv)
 {
 	int ret;
 
-	if (!lock_vol(cmd, "", LCK_VG_WRITE)) {
+	if (!lock_vol(cmd, ORPHAN, LCK_VG_WRITE)) {
 		log_error("Can't get lock for orphan PVs");
 		return ECMD_FAILED;
 	}
@@ -96,7 +96,7 @@ int vgremove(struct cmd_context *cmd, int argc, char **argv)
 			      LCK_VG_WRITE | LCK_NONBLOCK, 1, 
 			      NULL, &vgremove_single);
 
-	unlock_vg(cmd, "");
+	unlock_vg(cmd, ORPHAN);
 
 	return ret;
 }