summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorIlya Dryomov2012-06-22 20:13:01 +0200
committerChris Mason2012-07-23 22:27:52 +0200
commitfed425c742cb1262ce90a41f2d3d211bac099533 (patch)
tree0f7370ed50d86f7c3335a82934d8da43d9aca6fb /fs/btrfs
parentBtrfs: add DEVICE_READY ioctl (diff)
downloadkernel-qcow2-linux-fed425c742cb1262ce90a41f2d3d211bac099533.tar.gz
kernel-qcow2-linux-fed425c742cb1262ce90a41f2d3d211bac099533.tar.xz
kernel-qcow2-linux-fed425c742cb1262ce90a41f2d3d211bac099533.zip
Btrfs: do not return EINVAL instead of ENOMEM from open_ctree()
When bailing from open_ctree() err is returned, not ret. Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/disk-io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 2936ca49b3b4..fd216d9369fa 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2244,7 +2244,7 @@ int open_ctree(struct super_block *sb,
ret |= btrfs_start_workers(&fs_info->caching_workers);
ret |= btrfs_start_workers(&fs_info->readahead_workers);
if (ret) {
- ret = -ENOMEM;
+ err = -ENOMEM;
goto fail_sb_buffer;
}