Commit 19482792 authored by Kemeng Shi's avatar Kemeng Shi Committed by Theodore Ts'o
Browse files

Revert "ext4: remove unnecessary check in ext4_bg_num_gdb_nometa" 



This reverts commit ad3f09be.

The reverted commit was intended to simpfy the code to get group
descriptor block number in non-meta block group by assuming
s_gdb_count is block number used for all non-meta block group descriptors.
However s_gdb_count is block number used for all meta *and* non-meta
group descriptors. So s_gdb_group will be > actual group descriptor block
number used for all non-meta block group which should be "total non-meta
block group" / "group descriptors per block", e.g. s_first_meta_bg.

Signed-off-by: default avatarKemeng Shi <shikemeng@huaweicloud.com>
Link: https://lore.kernel.org/r/20230613225025.3859522-1-shikemeng@huaweicloud.com


Fixes: ad3f09be ("ext4: remove unnecessary check in ext4_bg_num_gdb_nometa")
Cc: stable@kernel.org
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent dea9d8f7

fs/ext4/balloc.c

+4 −1
Original line number Diff line number Diff line
@@ -886,6 +886,9 @@ static unsigned long ext4_bg_num_gdb_nometa(struct super_block *sb, 
	if (!ext4_bg_has_super(sb, group))

		return 0;



	if (ext4_has_feature_meta_bg(sb))

		return le32_to_cpu(EXT4_SB(sb)->s_es->s_first_meta_bg);

	else

		return EXT4_SB(sb)->s_gdb_count;

}