btrfs: Remove fs_info argument from remove_from_free_space_tree

This function alreay takes a transaction handle which holds a reference
to the fs_info. Use that and remove the extra argument.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 37ffd49190870d32371cb52482d35b1a8222edb2..70f6dc7ca010623543aa914ee77541f03f17acd2 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -8173,8 +8173,7 @@ static int alloc_reserved_file_extent(struct btrfs_trans_handle *trans,
        btrfs_mark_buffer_dirty(path->nodes[0]);
        btrfs_free_path(path);
 
-       ret = remove_from_free_space_tree(trans, fs_info, ins->objectid,
-                                         ins->offset);
+       ret = remove_from_free_space_tree(trans, ins->objectid, ins->offset);
        if (ret)
                return ret;
 
@@ -8256,8 +8255,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,
        btrfs_mark_buffer_dirty(leaf);
        btrfs_free_path(path);
 
-       ret = remove_from_free_space_tree(trans, fs_info, ins->objectid,
-                                         num_bytes);
+       ret = remove_from_free_space_tree(trans, ins->objectid, num_bytes);
        if (ret)
                return ret;
 

diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c
index d9d464f0c72461490b9679e8136680ac67579331..36da2c3a28f677dbbc080b37320e65759cfa0706 100644 (file)
--- a/fs/btrfs/free-space-tree.c
+++ b/fs/btrfs/free-space-tree.c
@@ -806,14 +806,13 @@ int __remove_from_free_space_tree(struct btrfs_trans_handle *trans,
 }
 
 int remove_from_free_space_tree(struct btrfs_trans_handle *trans,
-                               struct btrfs_fs_info *fs_info,
                                u64 start, u64 size)
 {
        struct btrfs_block_group_cache *block_group;
        struct btrfs_path *path;
        int ret;
 
-       if (!btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE))
+       if (!btrfs_fs_compat_ro(trans->fs_info, FREE_SPACE_TREE))
                return 0;
 
        path = btrfs_alloc_path();
@@ -822,7 +821,7 @@ int remove_from_free_space_tree(struct btrfs_trans_handle *trans,
                goto out;
        }
 
-       block_group = btrfs_lookup_block_group(fs_info, start);
+       block_group = btrfs_lookup_block_group(trans->fs_info, start);
        if (!block_group) {
                ASSERT(0);
                ret = -ENOENT;

diff --git a/fs/btrfs/free-space-tree.h b/fs/btrfs/free-space-tree.h
index ca3ad610a8d060a70d69f05121479480d2e363a4..95916320abecb3d5721a7a57fa08d8689afd6d37 100644 (file)
--- a/fs/btrfs/free-space-tree.h
+++ b/fs/btrfs/free-space-tree.h
@@ -26,7 +26,6 @@ int add_to_free_space_tree(struct btrfs_trans_handle *trans,
                           struct btrfs_fs_info *fs_info,
                           u64 start, u64 size);
 int remove_from_free_space_tree(struct btrfs_trans_handle *trans,
-                               struct btrfs_fs_info *fs_info,
                                u64 start, u64 size);
 
 #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS