public inbox for linux-btrfs@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH -V2] btrfs-progs: add mounted-checking for btrfs-vol
@ 2010-02-03  2:12 Miao Xie
  0 siblings, 0 replies; only message in thread
From: Miao Xie @ 2010-02-03  2:12 UTC (permalink / raw)
  To: Chris Mason, Wengang Wang; +Cc: Linux Btrfs

Adding a mounted device is dangerous because it will destroy the filesystem
on that mounted device. So we add mounted-checking for btrfs-vol.

Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
---
 btrfs-vol.c |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/btrfs-vol.c b/btrfs-vol.c
index 8069778..4ed799d 100644
--- a/btrfs-vol.c
+++ b/btrfs-vol.c
@@ -108,10 +108,24 @@ int main(int ac, char **av)
 	if (device && strcmp(device, "missing") == 0 &&
 	    cmd == BTRFS_IOC_RM_DEV) {
 		fprintf(stderr, "removing missing devices from %s\n", mnt);
-	} else if (device) {
+	} else if (cmd != BTRFS_IOC_BALANCE) {
+		if (cmd == BTRFS_IOC_ADD_DEV) {
+			ret = check_mounted(device);
+			if (ret < 0) {
+				fprintf(stderr,
+					"error checking %s mount status\n",
+					device);
+				exit(1);
+			}
+			if (ret == 1) {
+				fprintf(stderr, "%s is mounted\n", device);
+				exit(1);
+			}
+		}
 		devfd = open(device, O_RDWR);
-		if (!devfd) {
+		if (devfd < 0) {
 			fprintf(stderr, "Unable to open device %s\n", device);
+			exit(1);
 		}
 		ret = fstat(devfd, &st);
 		if (ret) {
-- 
1.6.5.2


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2010-02-03  2:12 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-03  2:12 [PATCH -V2] btrfs-progs: add mounted-checking for btrfs-vol Miao Xie

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox