diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-11-17 01:10:02 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-08 19:34:39 -0500 |
commit | ad2b2c802be2d3e8ed8364fef5ffaddabe448219 (patch) | |
tree | 5927c2170cd4edb1d930cabae0c6f0006aa972fd /fs/btrfs/super.c | |
parent | e3029d9fd426c8f582210ba35551ae5506218345 (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.c | 8 |
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, | |||
604 | sb->s_flags |= MS_POSIXACL; | 604 | sb->s_flags |= MS_POSIXACL; |
605 | #endif | 605 | #endif |
606 | 606 | ||
607 | tree_root = open_ctree(sb, fs_devices, (char *)data); | 607 | err = open_ctree(sb, fs_devices, (char *)data); |
608 | 608 | if (err) { | |
609 | if (IS_ERR(tree_root)) { | ||
610 | printk("btrfs: open_ctree failed\n"); | 609 | printk("btrfs: open_ctree failed\n"); |
611 | return PTR_ERR(tree_root); | 610 | return err; |
612 | } | 611 | } |
612 | tree_root = sb->s_fs_info; | ||
613 | fs_info = tree_root->fs_info; | 613 | fs_info = tree_root->fs_info; |
614 | sb->s_fs_info = tree_root; | 614 | sb->s_fs_info = tree_root; |
615 | 615 | ||