From 4aed570b869449fcd626878032680028a61c529a Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Fri, 16 Jan 2009 11:59:08 -0500
Subject: [PATCH] --- yaml --- r: 129863 b: refs/heads/master c:
 c071fcfdb60e7abbe95e02460005d6bca165bf24 h: refs/heads/master i:   129861:
 75f3aca19a56d4676846f74ea4e13abc1cf5cb1c   129859:
 04d94f4436f2e0dcc14e5577637691563c978848   129855:
 97612db0727d3c6bb51bcb67dbbc6e95043fad47 v: v3

---
 [refs]                 |  2 +-
 trunk/fs/btrfs/ioctl.h | 14 ++++++++------
 trunk/fs/btrfs/super.c |  3 ++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 4e07fc528c03..4c9bc6981a23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d9e2ae949411c2f329f30e01ea0355cd02c4296
+refs/heads/master: c071fcfdb60e7abbe95e02460005d6bca165bf24
diff --git a/trunk/fs/btrfs/ioctl.h b/trunk/fs/btrfs/ioctl.h
index 78049ea208db..b320b103fa13 100644
--- a/trunk/fs/btrfs/ioctl.h
+++ b/trunk/fs/btrfs/ioctl.h
@@ -22,13 +22,20 @@
 
 #define BTRFS_IOCTL_MAGIC 0x94
 #define BTRFS_VOL_NAME_MAX 255
-#define BTRFS_PATH_NAME_MAX 3072
+#define BTRFS_PATH_NAME_MAX 4087
 
+/* this should be 4k */
 struct btrfs_ioctl_vol_args {
 	__s64 fd;
 	char name[BTRFS_PATH_NAME_MAX + 1];
 };
 
+struct btrfs_ioctl_clone_range_args {
+  __s64 src_fd;
+  __u64 src_offset, src_length;
+  __u64 dest_offset;
+};
+
 #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \
 				   struct btrfs_ioctl_vol_args)
 #define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \
@@ -52,11 +59,6 @@ struct btrfs_ioctl_vol_args {
 				   struct btrfs_ioctl_vol_args)
 #define BTRFS_IOC_BALANCE _IOW(BTRFS_IOCTL_MAGIC, 12, \
 				   struct btrfs_ioctl_vol_args)
-struct btrfs_ioctl_clone_range_args {
-  __s64 src_fd;
-  __u64 src_offset, src_length;
-  __u64 dest_offset;
-};
 
 #define BTRFS_IOC_CLONE_RANGE _IOW(BTRFS_IOCTL_MAGIC, 13, \
 				  struct btrfs_ioctl_clone_range_args)
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
index b4c101d9322c..92c9b543deff 100644
--- a/trunk/fs/btrfs/super.c
+++ b/trunk/fs/btrfs/super.c
@@ -582,7 +582,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
 {
 	struct btrfs_ioctl_vol_args *vol;
 	struct btrfs_fs_devices *fs_devices;
-	int ret = 0;
+	int ret = -ENOTTY;
 	int len;
 
 	if (!capable(CAP_SYS_ADMIN))
@@ -594,6 +594,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
 		goto out;
 	}
 	len = strnlen(vol->name, BTRFS_PATH_NAME_MAX);
+
 	switch (cmd) {
 	case BTRFS_IOC_SCAN_DEV:
 		ret = btrfs_scan_one_device(vol->name, FMODE_READ,