btrfs: call functions that always use the same root with fs_info instead

There are many functions that are always called with the same root
argument.  Rather than passing the same root every time, we can
pass an fs_info pointer instead and have the function get the root
pointer itself.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

1 files changed, 23 insertions, 21 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 92c2aea5118b..1db5f0304c6b 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2296,8 +2296,7 @@ static void btrfs_init_balance(struct btrfs_fs_info *fs_info)
         init_waitqueue_head(&fs_info->balance_wait_q);
 }
 
-static void btrfs_init_btree_inode(struct btrfs_fs_info *fs_info,
-                                   struct btrfs_root *tree_root)
+static void btrfs_init_btree_inode(struct btrfs_fs_info *fs_info)
 {
         fs_info->btree_inode->i_ino = BTRFS_BTREE_INODE_OBJECTID;
         set_nlink(fs_info->btree_inode, 1);
@@ -2317,7 +2316,7 @@ static void btrfs_init_btree_inode(struct btrfs_fs_info *fs_info,
 
         BTRFS_I(fs_info->btree_inode)->io_tree.ops = &btree_extent_io_ops;
 
-        BTRFS_I(fs_info->btree_inode)->root = tree_root;
+        BTRFS_I(fs_info->btree_inode)->root = fs_info->tree_root;
         memset(&BTRFS_I(fs_info->btree_inode)->location, 0,
                sizeof(struct btrfs_key));
         set_bit(BTRFS_INODE_DUMMY,
@@ -2485,7 +2484,7 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info,
         }
 
         if (fs_info->sb->s_flags & MS_RDONLY) {
-                ret = btrfs_commit_super(tree_root);
+                ret = btrfs_commit_super(fs_info);
                 if (ret)
                         return ret;
         }
@@ -2493,13 +2492,15 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info,
         return 0;
 }
 
-static int btrfs_read_roots(struct btrfs_fs_info *fs_info,
-                            struct btrfs_root *tree_root)
+static int btrfs_read_roots(struct btrfs_fs_info *fs_info)
 {
+        struct btrfs_root *tree_root = fs_info->tree_root;
         struct btrfs_root *root;
         struct btrfs_key location;
         int ret;
 
+        BUG_ON(!fs_info->tree_root);
+
         location.objectid = BTRFS_EXTENT_TREE_OBJECTID;
         location.type = BTRFS_ROOT_ITEM_KEY;
         location.offset = 0;
@@ -2710,7 +2711,7 @@ int open_ctree(struct super_block *sb,
         sb->s_blocksize_bits = blksize_bits(4096);
         sb->s_bdi = &fs_info->bdi;
 
-        btrfs_init_btree_inode(fs_info, tree_root);
+        btrfs_init_btree_inode(fs_info);
 
         spin_lock_init(&fs_info->block_group_cache_lock);
         fs_info->block_group_cache_tree = RB_ROOT;
@@ -2908,7 +2909,7 @@ int open_ctree(struct super_block *sb,
         sb->s_blocksize_bits = blksize_bits(sectorsize);
 
         mutex_lock(&fs_info->chunk_mutex);
-        ret = btrfs_read_sys_array(tree_root);
+        ret = btrfs_read_sys_array(fs_info);
         mutex_unlock(&fs_info->chunk_mutex);
         if (ret) {
                 btrfs_err(fs_info, "failed to read the system array: %d", ret);
@@ -2985,7 +2986,7 @@ retry_root_backup:
 
         mutex_unlock(&tree_root->objectid_mutex);
 
-        ret = btrfs_read_roots(fs_info, tree_root);
+        ret = btrfs_read_roots(fs_info);
         if (ret)
                 goto recovery_tree_root;
 
@@ -3106,7 +3107,7 @@ retry_root_backup:
                 }
         }
 
-        ret = btrfs_find_orphan_roots(tree_root);
+        ret = btrfs_find_orphan_roots(fs_info);
         if (ret)
                 goto fail_qgroup;
 
@@ -3154,7 +3155,7 @@ retry_root_backup:
                 if (ret) {
                         btrfs_warn(fs_info,
                                    "failed to clear free space tree: %d", ret);
-                        close_ctree(tree_root);
+                        close_ctree(fs_info);
                         return ret;
                 }
         }
@@ -3166,7 +3167,7 @@ retry_root_backup:
                 if (ret) {
                         btrfs_warn(fs_info,
                                 "failed to create free space tree: %d", ret);
-                        close_ctree(tree_root);
+                        close_ctree(fs_info);
                         return ret;
                 }
         }
@@ -3175,7 +3176,7 @@ retry_root_backup:
         if ((ret = btrfs_orphan_cleanup(fs_info->fs_root)) ||
             (ret = btrfs_orphan_cleanup(fs_info->tree_root))) {
                 up_read(&fs_info->cleanup_work_sem);
-                close_ctree(tree_root);
+                close_ctree(fs_info);
                 return ret;
         }
         up_read(&fs_info->cleanup_work_sem);
@@ -3183,14 +3184,14 @@ retry_root_backup:
         ret = btrfs_resume_balance_async(fs_info);
         if (ret) {
                 btrfs_warn(fs_info, "failed to resume balance: %d", ret);
-                close_ctree(tree_root);
+                close_ctree(fs_info);
                 return ret;
         }
 
         ret = btrfs_resume_dev_replace_async(fs_info);
         if (ret) {
                 btrfs_warn(fs_info, "failed to resume device replace: %d", ret);
-                close_ctree(tree_root);
+                close_ctree(fs_info);
                 return ret;
         }
 
@@ -3202,7 +3203,7 @@ retry_root_backup:
                 if (ret) {
                         btrfs_warn(fs_info,
                                 "failed to create the UUID tree: %d", ret);
-                        close_ctree(tree_root);
+                        close_ctree(fs_info);
                         return ret;
                 }
         } else if (btrfs_test_opt(tree_root->fs_info, RESCAN_UUID_TREE) ||
@@ -3213,7 +3214,7 @@ retry_root_backup:
                 if (ret) {
                         btrfs_warn(fs_info,
                                 "failed to check the UUID tree: %d", ret);
-                        close_ctree(tree_root);
+                        close_ctree(fs_info);
                         return ret;
                 }
         } else {
@@ -3886,8 +3887,9 @@ int btrfs_cleanup_fs_roots(struct btrfs_fs_info *fs_info)
         return err;
 }
 
-int btrfs_commit_super(struct btrfs_root *root)
+int btrfs_commit_super(struct btrfs_fs_info *fs_info)
 {
+        struct btrfs_root *root = fs_info->tree_root;
         struct btrfs_trans_handle *trans;
 
         mutex_lock(&root->fs_info->cleaner_mutex);
@@ -3905,9 +3907,9 @@ int btrfs_commit_super(struct btrfs_root *root)
         return btrfs_commit_transaction(trans, root);
 }
 
-void close_ctree(struct btrfs_root *root)
+void close_ctree(struct btrfs_fs_info *fs_info)
 {
-        struct btrfs_fs_info *fs_info = root->fs_info;
+        struct btrfs_root *root = fs_info->tree_root;
         int ret;
 
         set_bit(BTRFS_FS_CLOSING_START, &fs_info->flags);
@@ -3944,7 +3946,7 @@ void close_ctree(struct btrfs_root *root)
                  */
                 btrfs_delete_unused_bgs(root->fs_info);
 
-                ret = btrfs_commit_super(root);
+                ret = btrfs_commit_super(fs_info);
                 if (ret)
                         btrfs_err(fs_info, "commit super ret %d", ret);
         }