btrfs: Remove fs_info from btrfs_alloc_chunk

It can be referenced from trans since the function is always called
within a transaction.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Qu Wenruo <wqu@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 556b93c05ee31af0b5a3f526d9a23e8e2e740d6c..c0928fcb3f32877db32a8911b74ab87a7f666545 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4568,7 +4568,7 @@ void check_system_chunk(struct btrfs_trans_handle *trans,
                 * the paths we visit in the chunk tree (they were already COWed
                 * or created in the current transaction for example).
                 */
-               ret = btrfs_alloc_chunk(trans, fs_info, flags);
+               ret = btrfs_alloc_chunk(trans, flags);
        }
 
        if (!ret) {
@@ -4670,7 +4670,7 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags,
         */
        check_system_chunk(trans, fs_info, flags);
 
-       ret = btrfs_alloc_chunk(trans, fs_info, flags);
+       ret = btrfs_alloc_chunk(trans, flags);
        trans->allocating_chunk = false;
 
        spin_lock(&space_info->lock);

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index ff7c8cdacd851d5effff85f8d94d71f01fcad81a..4a74232942701a77ce3785ced4b8ed8cf15c8cfc 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -5038,13 +5038,12 @@ int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
  * require modifying the chunk tree. This division is important for the
  * bootstrap process of adding storage to a seed btrfs.
  */
-int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
-                     struct btrfs_fs_info *fs_info, u64 type)
+int btrfs_alloc_chunk(struct btrfs_trans_handle *trans, u64 type)
 {
        u64 chunk_offset;
 
-       lockdep_assert_held(&fs_info->chunk_mutex);
-       chunk_offset = find_next_chunk(fs_info);
+       lockdep_assert_held(&trans->fs_info->chunk_mutex);
+       chunk_offset = find_next_chunk(trans->fs_info);
        return __btrfs_alloc_chunk(trans, chunk_offset, type);
 }
 

diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 5139ec8daf4cbfbace23b714fa783af33107870e..df2d8bdf8c9a042fcf2fde434657e303f3855e29 100644 (file)
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -396,8 +396,7 @@ int btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start,
                     u64 physical, u64 **logical, int *naddrs, int *stripe_len);
 int btrfs_read_sys_array(struct btrfs_fs_info *fs_info);
 int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info);
-int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
-                     struct btrfs_fs_info *fs_info, u64 type);
+int btrfs_alloc_chunk(struct btrfs_trans_handle *trans, u64 type);
 void btrfs_mapping_init(struct btrfs_mapping_tree *tree);
 void btrfs_mapping_tree_free(struct btrfs_mapping_tree *tree);
 blk_status_t btrfs_map_bio(struct btrfs_fs_info *fs_info, struct bio *bio,