aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/disk-io.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/disk-io.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/disk-io.c')
-rw-r--r--fs/btrfs/disk-io.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 9308c7f13c17..78247522c693 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1880,9 +1880,9 @@ static void free_root_pointers(struct btrfs_fs_info *info, int chunk_root)
1880} 1880}
1881 1881
1882 1882
1883struct btrfs_root *open_ctree(struct super_block *sb, 1883int open_ctree(struct super_block *sb,
1884 struct btrfs_fs_devices *fs_devices, 1884 struct btrfs_fs_devices *fs_devices,
1885 char *options) 1885 char *options)
1886{ 1886{
1887 u32 sectorsize; 1887 u32 sectorsize;
1888 u32 nodesize; 1888 u32 nodesize;
@@ -2428,11 +2428,11 @@ retry_root_backup:
2428 if (err) { 2428 if (err) {
2429 close_ctree(tree_root); 2429 close_ctree(tree_root);
2430 free_fs_info(fs_info); 2430 free_fs_info(fs_info);
2431 return ERR_PTR(err); 2431 return err;
2432 } 2432 }
2433 } 2433 }
2434 2434
2435 return tree_root; 2435 return 0;
2436 2436
2437fail_trans_kthread: 2437fail_trans_kthread:
2438 kthread_stop(fs_info->transaction_kthread); 2438 kthread_stop(fs_info->transaction_kthread);
@@ -2479,7 +2479,7 @@ fail_srcu:
2479fail: 2479fail:
2480 btrfs_close_devices(fs_info->fs_devices); 2480 btrfs_close_devices(fs_info->fs_devices);
2481 free_fs_info(fs_info); 2481 free_fs_info(fs_info);
2482 return ERR_PTR(err); 2482 return err;
2483 2483
2484recovery_tree_root: 2484recovery_tree_root:
2485 if (!btrfs_test_opt(tree_root, RECOVERY)) 2485 if (!btrfs_test_opt(tree_root, RECOVERY))