summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
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
parent3b96362cc8d314c935c335d5c3c42eb93c23166b (diff)
downloadkernel-crypto-f819d837eea9829ed6c356fb88cdd0a170cbd947.tar.gz
kernel-crypto-f819d837eea9829ed6c356fb88cdd0a170cbd947.tar.xz
kernel-crypto-f819d837eea9829ed6c356fb88cdd0a170cbd947.zip
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')
-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 05029656e42..77f44494e22 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)