summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/super.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-11-17 01:10:02 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-08 19:34:39 -0500
commitad2b2c802be2d3e8ed8364fef5ffaddabe448219 (patch)
tree5927c2170cd4edb1d930cabae0c6f0006aa972fd /fs/btrfs/super.c
parente3029d9fd426c8f582210ba35551ae5506218345 (diff)
btrfs: make open_ctree() return int
It returns either ERR_PTR(-ve) or sb->s_fs_info. The latter can be found by caller just as well, TYVM, no need to return it. Just return -ve or 0... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/btrfs/super.c')
-rw-r--r--fs/btrfs/super.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index e9f876a1655b..56e007fd6702 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -604,12 +604,12 @@ static int btrfs_fill_super(struct super_block *sb,
sb->s_flags |= MS_POSIXACL;
#endif
- tree_root = open_ctree(sb, fs_devices, (char *)data);
-
- if (IS_ERR(tree_root)) {
+ err = open_ctree(sb, fs_devices, (char *)data);
+ if (err) {
printk("btrfs: open_ctree failed\n");
- return PTR_ERR(tree_root);
+ return err;
}
+ tree_root = sb->s_fs_info;
fs_info = tree_root->fs_info;
sb->s_fs_info = tree_root;