Commit 27d40cc6 authored by Theodore Ts'o's avatar Theodore Ts'o Committed by Zheng Zengkai
Browse files

ext4: fix overhead calculation to account for the reserved gdt blocks 

stable inclusion
from stable-v5.10.113
commit 4789149b9ea2a1893c62d816742f1a76514fc901
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5ISAH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4789149b9ea2a1893c62d816742f1a76514fc901



--------------------------------

commit 10b01ee9 upstream.

The kernel calculation was underestimating the overhead by not taking
into account the reserved gdt blocks.  With this change, the overhead
calculated by the kernel matches the overhead calculation in mke2fs.

Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parent cf4de22f

fs/ext4/super.c

+3 −1
Original line number Diff line number Diff line
@@ -3912,9 +3912,11 @@ static int count_overhead(struct super_block *sb, ext4_group_t grp, 
	ext4_fsblk_t		first_block, last_block, b;

	ext4_group_t		i, ngroups = ext4_get_groups_count(sb);

	int			s, j, count = 0;

	int			has_super = ext4_bg_has_super(sb, grp);



	if (!ext4_has_feature_bigalloc(sb))

		return (ext4_bg_has_super(sb, grp) + ext4_bg_num_gdb(sb, grp) +

		return (has_super + ext4_bg_num_gdb(sb, grp) +

			(has_super ? le16_to_cpu(sbi->s_es->s_reserved_gdt_blocks) : 0) +

			sbi->s_itb_per_group + 2);



	first_block = le32_to_cpu(sbi->s_es->s_first_data_block) +