aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/super.c
diff options
context:
space:
mode:
authorLinda Knippers <linda.knippers@hp.com>2008-06-09 22:17:11 -0400
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:04:03 -0400
commitf819d837eea9829ed6c356fb88cdd0a170cbd947 (patch)
treeef5cd5c8b113ba0cc998a2ff53b002847105fcdf /fs/btrfs/super.c
parent3b96362cc8d314c935c335d5c3c42eb93c23166b (diff)
btrfsctl -A error code fixup
Send the error back to userland if the ioctl fails Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/super.c')
-rw-r--r--fs/btrfs/super.c4
1 files changed, 2 insertions, 2 deletions
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,
453{ 453{
454 struct btrfs_ioctl_vol_args *vol; 454 struct btrfs_ioctl_vol_args *vol;
455 struct btrfs_fs_devices *fs_devices; 455 struct btrfs_fs_devices *fs_devices;
456 int ret; 456 int ret = 0;
457 int len; 457 int len;
458 458
459 vol = kmalloc(sizeof(*vol), GFP_KERNEL); 459 vol = kmalloc(sizeof(*vol), GFP_KERNEL);
@@ -470,7 +470,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
470 } 470 }
471out: 471out:
472 kfree(vol); 472 kfree(vol);
473 return 0; 473 return ret;
474} 474}
475 475
476static void btrfs_write_super_lockfs(struct super_block *sb) 476static void btrfs_write_super_lockfs(struct super_block *sb)