Refuse to run pvcreate/pvremove on devices we can't open exclusively.

2 files changed, 18 insertions, 2 deletions

diff --git a/tools/pvcreate.c b/tools/pvcreate.c
index a0b7807a..75995dd3 100644
--- a/tools/pvcreate.c
+++ b/tools/pvcreate.c
@@ -82,6 +82,12 @@ static int pvcreate_check(struct cmd_context *cmd, const char *name)
 		return 0;
 	}
 
+	if (!dev_test_excl(dev)) {
+		log_error("Can't open %s exclusively.  Mounted filesystem?",
+			  name);
+		return 0;
+	}
+
 	/* Wipe superblock? */
 	if (dev_is_md(dev, &md_superblock) &&
 	    ((!arg_count(cmd, uuidstr_ARG) &&
@@ -218,8 +224,12 @@ static int pvcreate_single(struct cmd_context *cmd, const char *pv_name,
 			log_error("%s not opened: device not zeroed", pv_name);
 			goto error;
 		}
-			
-		dev_zero(dev, UINT64_C(0), (size_t) 2048);
+
+		if (!dev_zero(dev, UINT64_C(0), (size_t) 2048)) {
+			log_error("%s not wiped: aborting", pv_name);
+			dev_close(dev);
+			goto error;
+		}
 		dev_close(dev);
 	}
 
diff --git a/tools/pvremove.c b/tools/pvremove.c
index 6fd9daa0..1fce587a 100644
--- a/tools/pvremove.c
+++ b/tools/pvremove.c
@@ -86,6 +86,12 @@ static int pvremove_single(struct cmd_context *cmd, const char *pv_name,
 		goto error;
 	}
 
+	if (!dev_test_excl(dev)) {
+		log_error("Can't open %s exclusively.  Mounted filesystem?",
+			  dev_name(dev));
+		return 0;
+	}
+
 	/* Wipe existing label(s) */
 	if (!label_remove(dev)) {
 		log_error("Failed to wipe existing label(s) on %s", pv_name);