btrfs: Remove fs_info from btrfs_finish_chunk_alloc

It can be referenced from the passed transaction handle.

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

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index c71aa118679d33c0023ff2d0c0a893cca5019e09..16b916a33e562573ad735020dc84eb67b784ec14 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -10022,8 +10022,7 @@ void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans)
                                        sizeof(item));
                if (ret)
                        btrfs_abort_transaction(trans, ret);
-               ret = btrfs_finish_chunk_alloc(trans, fs_info, key.objectid,
-                                              key.offset);
+               ret = btrfs_finish_chunk_alloc(trans, key.objectid, key.offset);
                if (ret)
                        btrfs_abort_transaction(trans, ret);
                add_block_group_free_space(trans, block_group);
@@ -10594,8 +10593,7 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info)
                 * Btrfs_remove_chunk will abort the transaction if things go
                 * horribly wrong.
                 */
-               ret = btrfs_remove_chunk(trans, fs_info,
-                                        block_group->key.objectid);
+               ret = btrfs_remove_chunk(trans, block_group->key.objectid);
 
                if (ret) {
                        if (trimming)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 991022f5219f522e993d941a3915effc192bbf97..d86346f83a08dc0bdbf23f25764388ec5e9cee3b 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2716,9 +2716,9 @@ static struct extent_map *get_chunk_map(struct btrfs_fs_info *fs_info,
        return em;
 }
 
-int btrfs_remove_chunk(struct btrfs_trans_handle *trans,
-                      struct btrfs_fs_info *fs_info, u64 chunk_offset)
+int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)
 {
+       struct btrfs_fs_info *fs_info = trans->fs_info;
        struct extent_map *em;
        struct map_lookup *map;
        u64 dev_extent_len = 0;
@@ -2858,7 +2858,7 @@ static int btrfs_relocate_chunk(struct btrfs_fs_info *fs_info, u64 chunk_offset)
         * step two, delete the device extents and the
         * chunk tree entries
         */
-       ret = btrfs_remove_chunk(trans, fs_info, chunk_offset);
+       ret = btrfs_remove_chunk(trans, chunk_offset);
        btrfs_end_transaction(trans);
        return ret;
 }
@@ -4842,9 +4842,9 @@ error:
 }
 
 int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
-                               struct btrfs_fs_info *fs_info,
-                               u64 chunk_offset, u64 chunk_size)
+                            u64 chunk_offset, u64 chunk_size)
 {
+       struct btrfs_fs_info *fs_info = trans->fs_info;
        struct btrfs_root *extent_root = fs_info->extent_root;
        struct btrfs_root *chunk_root = fs_info->chunk_root;
        struct btrfs_key key;

diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 69a028058c43f480764504476a076152d9a312d5..049619176831cf729efc188d92a69c017e6c91c8 100644 (file)
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -462,10 +462,8 @@ int btrfs_is_parity_mirror(struct btrfs_fs_info *fs_info,
 unsigned long btrfs_full_stripe_len(struct btrfs_fs_info *fs_info,
                                    u64 logical);
 int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
-                               struct btrfs_fs_info *fs_info,
-                               u64 chunk_offset, u64 chunk_size);
-int btrfs_remove_chunk(struct btrfs_trans_handle *trans,
-                      struct btrfs_fs_info *fs_info, u64 chunk_offset);
+                            u64 chunk_offset, u64 chunk_size);
+int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset);
 
 static inline void btrfs_dev_stat_inc(struct btrfs_device *dev,
                                      int index)