]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
btrfs: remove block group argument from copy_free_space_cache()
authorFilipe Manana <fdmanana@suse.com>
Wed, 15 Apr 2026 14:10:00 +0000 (15:10 +0100)
committerDavid Sterba <dsterba@suse.com>
Mon, 8 Jun 2026 13:53:29 +0000 (15:53 +0200)
It's not necessary since we can get the block group from the given
free space control structure.

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

index f0c808a89eafac610355afe0e535dfacb62481c2..b2d3d9e048fea03fbf1113eef2a4c532e5b898ab 100644 (file)
@@ -893,8 +893,7 @@ free_cache:
        goto out;
 }
 
-static int copy_free_space_cache(struct btrfs_block_group *block_group,
-                                struct btrfs_free_space_ctl *ctl)
+static int copy_free_space_cache(struct btrfs_free_space_ctl *ctl)
 {
        struct btrfs_free_space *info;
        struct rb_node *n;
@@ -909,7 +908,7 @@ static int copy_free_space_cache(struct btrfs_block_group *block_group,
                        unlink_free_space(ctl, info, true);
                        spin_unlock(&ctl->tree_lock);
                        kmem_cache_free(btrfs_free_space_cachep, info);
-                       ret = btrfs_add_free_space(block_group, offset, bytes);
+                       ret = btrfs_add_free_space(ctl->block_group, offset, bytes);
                        spin_lock(&ctl->tree_lock);
                } else {
                        u64 offset = info->offset;
@@ -919,7 +918,7 @@ static int copy_free_space_cache(struct btrfs_block_group *block_group,
                        if (ret == 0) {
                                bitmap_clear_bits(ctl, info, offset, bytes, true);
                                spin_unlock(&ctl->tree_lock);
-                               ret = btrfs_add_free_space(block_group, offset,
+                               ret = btrfs_add_free_space(ctl->block_group, offset,
                                                           bytes);
                                spin_lock(&ctl->tree_lock);
                        } else {
@@ -1022,7 +1021,7 @@ int load_free_space_cache(struct btrfs_block_group *block_group)
 
        if (matched) {
                spin_lock(&tmp_ctl.tree_lock);
-               ret = copy_free_space_cache(block_group, &tmp_ctl);
+               ret = copy_free_space_cache(&tmp_ctl);
                spin_unlock(&tmp_ctl.tree_lock);
                /*
                 * ret == 1 means we successfully loaded the free space cache,