From 01077c81987011d8a50999824f96032c10b2733b Mon Sep 17 00:00:00 2001

From: Josef Bacik <jbacik@fusionio.com>

Date: Thu, 21 Jun 2012 16:02:10 -0400

Subject: [PATCH 1/3] Btrfs-progs: add btrfs device ready command

This command will be used by things like dracut that wish to know very

simply if all of the devices have been added to the kernel cache yet for the

device to be fully mounted.  This keeps initrd's from constantly having to

try to mount the file system until it succeeds every time a device is added

to the system.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fusionio.com>

---

 cmds-device.c |   35 +++++++++++++++++++++++++++++++++++

 ioctl.h       |    2 ++

 2 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/cmds-device.c b/cmds-device.c

index 771856b..b24e2a3 100644

--- a/cmds-device.c

+++ b/cmds-device.c

@@ -249,11 +249,46 @@ static int cmd_scan_dev(int argc, char **argv)

 	return 0;

 }

+static const char * const cmd_ready_dev_usage[] = {

+	"btrfs device ready <device>",

+	"Check device to see if it has all of it's devices in cache for mounting",

+	NULL

+};

+

+static int cmd_ready_dev(int argc, char **argv)

+{

+	struct	btrfs_ioctl_vol_args args;

+	int	fd;

+	int	ret;

+

+	if (check_argc_min(argc, 2))

+		usage(cmd_ready_dev_usage);

+

+	fd = open("/dev/btrfs-control", O_RDWR);

+	if (fd < 0) {

+		perror("failed to open /dev/btrfs-control");

+		return 10;

+	}

+

+	strncpy(args.name, argv[argc - 1], BTRFS_PATH_NAME_MAX);

+	ret = ioctl(fd, BTRFS_IOC_DEVICES_READY, &args);

+	if (ret < 0) {

+		fprintf(stderr, "ERROR: unable to determine if the device '%s'"

+			" is ready for mounting - %s\n", argv[argc - 1],

+			strerror(errno));

+		ret = 1;

+	}

+

+	close(fd);

+	return ret;

+}

+

 const struct cmd_group device_cmd_group = {

 	device_cmd_group_usage, NULL, {

 		{ "add", cmd_add_dev, cmd_add_dev_usage, NULL, 0 },

 		{ "delete", cmd_rm_dev, cmd_rm_dev_usage, NULL, 0 },

 		{ "scan", cmd_scan_dev, cmd_scan_dev_usage, NULL, 0 },

+		{ "ready", cmd_ready_dev, cmd_ready_dev_usage, NULL, 0 },

 		{ 0, 0, 0, 0, 0 }

 	}

 };

diff --git a/ioctl.h b/ioctl.h

index d6f3d07..30220ad 100644

--- a/ioctl.h

+++ b/ioctl.h

@@ -365,6 +365,8 @@ struct btrfs_ioctl_clone_range_args {

 					struct btrfs_ioctl_ino_path_args)

 #define BTRFS_IOC_LOGICAL_INO _IOWR(BTRFS_IOCTL_MAGIC, 36, \

 					struct btrfs_ioctl_ino_path_args)

+#define BTRFS_IOC_DEVICES_READY _IOR(BTRFS_IOCTL_MAGIC, 39, \

+				     struct btrfs_ioctl_vol_args)

 #define BTRFS_IOC_SET_RECEIVED_SUBVOL _IOWR(BTRFS_IOCTL_MAGIC, 37, \

 				struct btrfs_ioctl_received_subvol_args)

-- 

1.7.7.6