Skip to content

Commit 0c9091a

Browse files
fdmananakdave
authored andcommitted
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> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent aa7325c commit 0c9091a

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

fs/btrfs/block-group.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3071,7 +3071,7 @@ int btrfs_inc_block_group_ro(struct btrfs_block_group *cache,
30713071
* We have allocated a new chunk. We also need to activate that chunk to
30723072
* grant metadata tickets for zoned filesystem.
30733073
*/
3074-
ret = btrfs_zoned_activate_one_bg(fs_info, space_info, true);
3074+
ret = btrfs_zoned_activate_one_bg(space_info, true);
30753075
if (ret < 0)
30763076
goto out;
30773077

@@ -4339,7 +4339,7 @@ static void reserve_chunk_space(struct btrfs_trans_handle *trans,
43394339
* We have a new chunk. We also need to activate it for
43404340
* zoned filesystem.
43414341
*/
4342-
ret = btrfs_zoned_activate_one_bg(fs_info, info, true);
4342+
ret = btrfs_zoned_activate_one_bg(info, true);
43434343
if (ret < 0)
43444344
return;
43454345

fs/btrfs/zoned.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2754,10 +2754,9 @@ int btrfs_zone_finish_one_bg(struct btrfs_fs_info *fs_info)
27542754
return ret < 0 ? ret : 1;
27552755
}
27562756

2757-
int btrfs_zoned_activate_one_bg(struct btrfs_fs_info *fs_info,
2758-
struct btrfs_space_info *space_info,
2759-
bool do_finish)
2757+
int btrfs_zoned_activate_one_bg(struct btrfs_space_info *space_info, bool do_finish)
27602758
{
2759+
struct btrfs_fs_info *fs_info = space_info->fs_info;
27612760
struct btrfs_block_group *bg;
27622761
int index;
27632762

fs/btrfs/zoned.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@ bool btrfs_zoned_should_reclaim(const struct btrfs_fs_info *fs_info);
9494
void btrfs_zoned_release_data_reloc_bg(struct btrfs_fs_info *fs_info, u64 logical,
9595
u64 length);
9696
int btrfs_zone_finish_one_bg(struct btrfs_fs_info *fs_info);
97-
int btrfs_zoned_activate_one_bg(struct btrfs_fs_info *fs_info,
98-
struct btrfs_space_info *space_info, bool do_finish);
97+
int btrfs_zoned_activate_one_bg(struct btrfs_space_info *space_info, bool do_finish);
9998
void btrfs_check_active_zone_reservation(struct btrfs_fs_info *fs_info);
10099
int btrfs_reset_unused_block_groups(struct btrfs_space_info *space_info, u64 num_bytes);
101100
#else /* CONFIG_BLK_DEV_ZONED */
@@ -262,8 +261,7 @@ static inline int btrfs_zone_finish_one_bg(struct btrfs_fs_info *fs_info)
262261
return 1;
263262
}
264263

265-
static inline int btrfs_zoned_activate_one_bg(struct btrfs_fs_info *fs_info,
266-
struct btrfs_space_info *space_info,
264+
static inline int btrfs_zoned_activate_one_bg(struct btrfs_space_info *space_info,
267265
bool do_finish)
268266
{
269267
/* Consider all the block groups are active */

0 commit comments

Comments
 (0)