Commit cf6ae7ed authored Mar 26, 2025 by Qu Wenruo Committed by David Sterba Apr 17, 2025

btrfs: subpage: access correct object when reading bitmap start in subpage_calc_start_bit()



Inside the macro, subpage_calc_start_bit(), we need to calculate the
offset to the beginning of the folio.

But we're using offset_in_page(), on systems with 4K page size and 4K fs
block size, this means we will always return offset 0 for a large folio,
causing all kinds of errors.

Fix it by using offset_in_folio() instead.

Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent 65f2a3b2

fs/btrfs/subpage.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -204,7 +204,7 @@ static void btrfs_subpage_assert(const struct btrfs_fs_info *fs_info,
		btrfs_blocks_per_folio(fs_info, folio); \
		\
		btrfs_subpage_assert(fs_info, folio, start, len); \
		__start_bit = offset_in_page(start) >> fs_info->sectorsize_bits; \
		__start_bit = offset_in_folio(folio, start) >> fs_info->sectorsize_bits; \
		__start_bit += blocks_per_folio * btrfs_bitmap_nr_##name; \
		__start_bit; \
		})