btrfs: pass fs_info to btrfs_del_root instead of tree_root

btrfs_del_roots always uses the tree_root.  Let's pass fs_info instead.

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

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index b7cfc74..2add002 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2988,8 +2988,8 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans,
                       struct btrfs_fs_info *fs_info,
                       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_root *root,
-                  const struct btrfs_key *key);
+int btrfs_del_root(struct btrfs_trans_handle *trans,
+                  struct btrfs_fs_info *fs_info, 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 96e49fd..e2d7e86 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -9266,7 +9266,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root,
        if (err)
                goto out_end_trans;
 
-       ret = btrfs_del_root(trans, tree_root, &root->root_key);
+       ret = btrfs_del_root(trans, fs_info, &root->root_key);
        if (ret) {
                btrfs_abort_transaction(trans, ret);
                goto out_end_trans;

diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c
index a5e34de..684f122 100644 (file)
--- a/fs/btrfs/free-space-tree.c
+++ b/fs/btrfs/free-space-tree.c
@@ -1257,7 +1257,7 @@ int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info)
        if (ret)
                goto abort;
 
-       ret = btrfs_del_root(trans, tree_root, &free_space_root->root_key);
+       ret = btrfs_del_root(trans, fs_info, &free_space_root->root_key);
        if (ret)
                goto abort;
 

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index ddc37c5..5c8b61c 100644 (file)
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -946,7 +946,6 @@ out:
 int btrfs_quota_disable(struct btrfs_trans_handle *trans,
                        struct btrfs_fs_info *fs_info)
 {
-       struct btrfs_root *tree_root = fs_info->tree_root;
        struct btrfs_root *quota_root;
        int ret = 0;
 
@@ -968,7 +967,7 @@ int btrfs_quota_disable(struct btrfs_trans_handle *trans,
        if (ret)
                goto out;
 
-       ret = btrfs_del_root(trans, tree_root, &quota_root->root_key);
+       ret = btrfs_del_root(trans, fs_info, &quota_root->root_key);
        if (ret)
                goto out;
 

diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index 5b488af..9fb9896 100644 (file)
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -335,10 +335,11 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info)
        return err;
 }
 
-/* drop the root item for 'key' from 'root' */
-int btrfs_del_root(struct btrfs_trans_handle *trans, struct btrfs_root *root,
-                  const struct btrfs_key *key)
+/* 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)
 {
+       struct btrfs_root *root = fs_info->tree_root;
        struct btrfs_path *path;
        int ret;