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>

3 files changed, 13 insertions, 13 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)
 }
 
 
-struct btrfs_root *open_ctree(struct super_block *sb,
-                              struct btrfs_fs_devices *fs_devices,
-                              char *options)
+int open_ctree(struct super_block *sb,
+               struct btrfs_fs_devices *fs_devices,
+               char *options)
 {
         u32 sectorsize;
         u32 nodesize;
@@ -2428,11 +2428,11 @@ retry_root_backup:
                 if (err) {
                         close_ctree(tree_root);
                         free_fs_info(fs_info);
-                        return ERR_PTR(err);
+                        return err;
                 }
         }
 
-        return tree_root;
+        return 0;
 
 fail_trans_kthread:
         kthread_stop(fs_info->transaction_kthread);
@@ -2479,7 +2479,7 @@ fail_srcu:
 fail:
         btrfs_close_devices(fs_info->fs_devices);
         free_fs_info(fs_info);
-        return ERR_PTR(err);
+        return err;
 
 recovery_tree_root:
         if (!btrfs_test_opt(tree_root, RECOVERY))
diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h
index 2bb5f59ddf95..6f5f48778b00 100644
--- a/fs/btrfs/disk-io.h
+++ b/fs/btrfs/disk-io.h
@@ -46,9 +46,9 @@ struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,
                                                    u64 bytenr, u32 blocksize);
 int clean_tree_block(struct btrfs_trans_handle *trans,
                      struct btrfs_root *root, struct extent_buffer *buf);
-struct btrfs_root *open_ctree(struct super_block *sb,
-                              struct btrfs_fs_devices *fs_devices,
-                              char *options);
+int open_ctree(struct super_block *sb,
+               struct btrfs_fs_devices *fs_devices,
+               char *options);
 int close_ctree(struct btrfs_root *root);
 int write_ctree_super(struct btrfs_trans_handle *trans,
                       struct btrfs_root *root, int max_mirrors);
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;