btrfs: Remove fs_info from btrfs_del_root

It can be referenced from the passed transaction handle.

Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>

5 files changed, 6 insertions, 6 deletions

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 2e32584c635f..9ef47a171e2f 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2993,7 +2993,7 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans,
                        u64 root_id, u64 ref_id, u64 dirid, u64 *sequence,
                        const char *name, int name_len);
 int btrfs_del_root(struct btrfs_trans_handle *trans,
-                   struct btrfs_fs_info *fs_info, const struct btrfs_key *key);
+                   const struct btrfs_key *key);
 int btrfs_insert_root(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                       const struct btrfs_key *key,
                       struct btrfs_root_item *item);
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index fcaf598f4222..042dd4186fb8 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -9028,7 +9028,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root,
         if (err)
                 goto out_end_trans;
 
-        ret = btrfs_del_root(trans, fs_info, &root->root_key);
+        ret = btrfs_del_root(trans, &root->root_key);
         if (ret) {
                 btrfs_abort_transaction(trans, ret);
                 err = ret;
diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c
index b5950aacd697..d6736595ec57 100644
--- a/fs/btrfs/free-space-tree.c
+++ b/fs/btrfs/free-space-tree.c
@@ -1236,7 +1236,7 @@ int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info)
         if (ret)
                 goto abort;
 
-        ret = btrfs_del_root(trans, fs_info, &free_space_root->root_key);
+        ret = btrfs_del_root(trans, &free_space_root->root_key);
         if (ret)
                 goto abort;
 
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index e11ed7b3f32a..4353bb69bb86 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1088,7 +1088,7 @@ int btrfs_quota_disable(struct btrfs_fs_info *fs_info)
                 goto end_trans;
         }
 
-        ret = btrfs_del_root(trans, fs_info, &quota_root->root_key);
+        ret = btrfs_del_root(trans, &quota_root->root_key);
         if (ret) {
                 btrfs_abort_transaction(trans, ret);
                 goto end_trans;
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index c451285976ac..f7c14c454f91 100644
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -320,9 +320,9 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info)
 
 /* drop the root item for 'key' from the tree root */
 int btrfs_del_root(struct btrfs_trans_handle *trans,
-                   struct btrfs_fs_info *fs_info, const struct btrfs_key *key)
+                   const struct btrfs_key *key)
 {
-        struct btrfs_root *root = fs_info->tree_root;
+        struct btrfs_root *root = trans->fs_info->tree_root;
         struct btrfs_path *path;
         int ret;