]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
btrfs: remove fs_info argument from steal_from_global_rsv()
authorFilipe Manana <fdmanana@suse.com>
Mon, 13 Oct 2025 17:10:02 +0000 (18:10 +0100)
committerDavid Sterba <dsterba@suse.com>
Mon, 24 Nov 2025 20:59:10 +0000 (21:59 +0100)
We don't need it since we can grab fs_info from the given space_info.
So remove the fs_info argument.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Anand Jain <asj@kernel.org>
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/space-info.c

index 2446fe1310f6ddba084bc8fc24476207fdea3ccf..4dc2ae5d79a814804672cf0211f2536a64861e90 100644 (file)
@@ -1031,10 +1031,10 @@ static bool need_preemptive_reclaim(const struct btrfs_space_info *space_info)
                !test_bit(BTRFS_FS_STATE_REMOUNTING, &fs_info->fs_state));
 }
 
-static bool steal_from_global_rsv(struct btrfs_fs_info *fs_info,
-                                 struct btrfs_space_info *space_info,
+static bool steal_from_global_rsv(struct btrfs_space_info *space_info,
                                  struct reserve_ticket *ticket)
 {
+       struct btrfs_fs_info *fs_info = space_info->fs_info;
        struct btrfs_block_rsv *global_rsv = &fs_info->global_block_rsv;
        u64 min_bytes;
 
@@ -1096,7 +1096,7 @@ static bool maybe_fail_all_tickets(struct btrfs_space_info *space_info)
                ticket = list_first_entry(&space_info->tickets,
                                          struct reserve_ticket, list);
 
-               if (!aborted && steal_from_global_rsv(fs_info, space_info, ticket))
+               if (!aborted && steal_from_global_rsv(space_info, ticket))
                        return true;
 
                if (!aborted && btrfs_test_opt(fs_info, ENOSPC_DEBUG))
@@ -1525,7 +1525,7 @@ static void priority_reclaim_metadata_space(struct btrfs_space_info *space_info,
        if (BTRFS_FS_ERROR(fs_info)) {
                ticket->error = BTRFS_FS_ERROR(fs_info);
                remove_ticket(space_info, ticket);
-       } else if (!steal_from_global_rsv(fs_info, space_info, ticket)) {
+       } else if (!steal_from_global_rsv(space_info, ticket)) {
                ticket->error = -ENOSPC;
                remove_ticket(space_info, ticket);
        }