btrfs: remove fs_info argument from btrfs_zoned_activate_one_bg()

We don't need it since we can grab fs_info from the given space_info.
So remove the fs_info argument.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
index d7451400cc22e4a51d71c19f9f70c336d8eddfe1..ec1e4fc0cd51ec0d04faffa0ff7cc4b102855da2 100644 (file)
--- a/fs/btrfs/block-group.c
+++ b/fs/btrfs/block-group.c
@@ -3071,7 +3071,7 @@ int btrfs_inc_block_group_ro(struct btrfs_block_group *cache,
         * We have allocated a new chunk. We also need to activate that chunk to
         * grant metadata tickets for zoned filesystem.
         */
-       ret = btrfs_zoned_activate_one_bg(fs_info, space_info, true);
+       ret = btrfs_zoned_activate_one_bg(space_info, true);
        if (ret < 0)
                goto out;
 
@@ -4339,7 +4339,7 @@ static void reserve_chunk_space(struct btrfs_trans_handle *trans,
                         * We have a new chunk. We also need to activate it for
                         * zoned filesystem.
                         */
-                       ret = btrfs_zoned_activate_one_bg(fs_info, info, true);
+                       ret = btrfs_zoned_activate_one_bg(info, true);
                        if (ret < 0)
                                return;
 

diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
index d1db7fa1fe583a86fdc6a16af16af4d0cb4b94cf..9b8c9894a1de88f8450cddc33d7fe613fcdde2a8 100644 (file)
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
@@ -2750,10 +2750,9 @@ int btrfs_zone_finish_one_bg(struct btrfs_fs_info *fs_info)
        return ret < 0 ? ret : 1;
 }
 
-int btrfs_zoned_activate_one_bg(struct btrfs_fs_info *fs_info,
-                               struct btrfs_space_info *space_info,
-                               bool do_finish)
+int btrfs_zoned_activate_one_bg(struct btrfs_space_info *space_info, bool do_finish)
 {
+       struct btrfs_fs_info *fs_info = space_info->fs_info;
        struct btrfs_block_group *bg;
        int index;
 

diff --git a/fs/btrfs/zoned.h b/fs/btrfs/zoned.h
index 17c5656580dd9747f73196d4af3f49e74d150dbe..d64f7c9255faf916d2876c352a5ff782cb17f790 100644 (file)
--- a/fs/btrfs/zoned.h
+++ b/fs/btrfs/zoned.h
@@ -94,8 +94,7 @@ bool btrfs_zoned_should_reclaim(const struct btrfs_fs_info *fs_info);
 void btrfs_zoned_release_data_reloc_bg(struct btrfs_fs_info *fs_info, u64 logical,
                                       u64 length);
 int btrfs_zone_finish_one_bg(struct btrfs_fs_info *fs_info);
-int btrfs_zoned_activate_one_bg(struct btrfs_fs_info *fs_info,
-                               struct btrfs_space_info *space_info, bool do_finish);
+int btrfs_zoned_activate_one_bg(struct btrfs_space_info *space_info, bool do_finish);
 void btrfs_check_active_zone_reservation(struct btrfs_fs_info *fs_info);
 int btrfs_reset_unused_block_groups(struct btrfs_space_info *space_info, u64 num_bytes);
 #else /* CONFIG_BLK_DEV_ZONED */
@@ -262,8 +261,7 @@ static inline int btrfs_zone_finish_one_bg(struct btrfs_fs_info *fs_info)
        return 1;
 }
 
-static inline int btrfs_zoned_activate_one_bg(struct btrfs_fs_info *fs_info,
-                                             struct btrfs_space_info *space_info,
+static inline int btrfs_zoned_activate_one_bg(struct btrfs_space_info *space_info,
                                              bool do_finish)
 {
        /* Consider all the block groups are active */