]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
btrfs: remove bogus root search condition in sample_block_group_extent_item()
authorFilipe Manana <fdmanana@suse.com>
Wed, 21 Jan 2026 20:42:53 +0000 (20:42 +0000)
committerDavid Sterba <dsterba@suse.com>
Tue, 3 Feb 2026 06:56:19 +0000 (07:56 +0100)
There's no need to pass the maximum between the block group's start offset
and BTRFS_SUPER_INFO_OFFSET (64K) since we can't have any block groups
allocated in the first megabyte, as that's reserved space. Furthermore,
even if we could, the correct thing to do was to pass the block group's
start offset anyway - and that's precisely what we do for block groups
that happen to contain superblock mirror (the range for the super block
is never marked as free and it's marked as dirty in the
fs_info->excluded_extents io tree).

So simplify this and get rid of that maximum expression.

Reviewed-by: Boris Burkov <boris@bur.io>
Reviewed-by: Qu Wenruo <wqu@suse.com>
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/block-group.c

index 11ed303c664097b989a543d5d8afb1bf64fcadcd..66c512bc022c58b1f521f129e7a81b1ca54bdd66 100644 (file)
@@ -606,8 +606,7 @@ static int sample_block_group_extent_item(struct btrfs_caching_control *caching_
        lockdep_assert_held(&caching_ctl->mutex);
        lockdep_assert_held_read(&fs_info->commit_root_sem);
 
-       extent_root = btrfs_extent_root(fs_info, max_t(u64, block_group->start,
-                                                      BTRFS_SUPER_INFO_OFFSET));
+       extent_root = btrfs_extent_root(fs_info, block_group->start);
 
        search_offset = index * div_u64(block_group->length, max_index);
        search_key.objectid = block_group->start + search_offset;