]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
btrfs: don't pass io_ctl to __btrfs_write_out_cache()
authorJohannes Thumshirn <johannes.thumshirn@wdc.com>
Tue, 20 Jan 2026 08:19:46 +0000 (09:19 +0100)
committerDavid Sterba <dsterba@suse.com>
Tue, 3 Feb 2026 06:54:37 +0000 (07:54 +0100)
There's no need to pass both the block_group and block_group::io_ctl to
__btrfs_write_out_cache().

Remove passing io_ctl to __btrfs_write_out_cache() and dereference it
inside __btrfs_write_out_cache().

Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/free-space-cache.c

index 8dd15865ab0a53c81f4f730faa370040dd7a72fc..6fb813cc224b43034e33821571ceb5dc3acb403e 100644 (file)
@@ -1372,9 +1372,9 @@ int btrfs_wait_cache_io(struct btrfs_trans_handle *trans,
 static int __btrfs_write_out_cache(struct inode *inode,
                                   struct btrfs_free_space_ctl *ctl,
                                   struct btrfs_block_group *block_group,
-                                  struct btrfs_io_ctl *io_ctl,
                                   struct btrfs_trans_handle *trans)
 {
+       struct btrfs_io_ctl *io_ctl = &block_group->io_ctl;
        struct extent_state *cached_state = NULL;
        LIST_HEAD(bitmap_list);
        int entries = 0;
@@ -1534,8 +1534,7 @@ int btrfs_write_out_cache(struct btrfs_trans_handle *trans,
        if (IS_ERR(inode))
                return 0;
 
-       ret = __btrfs_write_out_cache(inode, ctl, block_group,
-                                     &block_group->io_ctl, trans);
+       ret = __btrfs_write_out_cache(inode, ctl, block_group, trans);
        if (ret) {
                btrfs_debug(fs_info,
          "failed to write free space cache for block group %llu error %d",