From: Linda Knippers <linda.knippers@hp.com>
Date: Tue, 10 Jun 2008 02:17:11 +0000 (-0400)
Subject: btrfsctl -A error code fixup
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f819d837eea9829ed6c356fb88cdd0a170cbd947;p=linux-beck.git

btrfsctl -A error code fixup

Send the error back to userland if the ioctl fails

Signed-off-by: Chris Mason <chris.mason@oracle.com>
---

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 05029656e42e..77f44494e229 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -453,7 +453,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;
+	int ret = 0;
 	int len;
 
 	vol = kmalloc(sizeof(*vol), GFP_KERNEL);
@@ -470,7 +470,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
 	}
 out:
 	kfree(vol);
-	return 0;
+	return ret;
 }
 
 static void btrfs_write_super_lockfs(struct super_block *sb)