Commit fd9c2ff8 authored Jul 26, 2022 by Theodore Ts'o Committed by Zheng Zengkai Jul 26, 2022

ext4: force overhead calculation if the s_overhead_cluster makes no sense

stable inclusion
from stable-v5.10.113
commit e1e96e37272156d691203a3725b876787f38c8f2
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=e1e96e37272156d691203a3725b876787f38c8f2



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

commit 85d825db upstream.

If the file system does not use bigalloc, calculating the overhead is
cheap, so force the recalculation of the overhead so we don't have to
trust the precalculated overhead in the superblock.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
Acked-by: Xie XiuQi <xiexiuqi@huawei.com>

parent 27d40cc6

fs/ext4/super.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -4977,9 +4977,18 @@ static int ext4_fill_super(struct super_block sb, void data, int silent)
		* Get the # of file system overhead blocks from the
		* superblock if present.
		*/
		if (es->s_overhead_clusters)
		sbi->s_overhead = le32_to_cpu(es->s_overhead_clusters);
		else {
		/* ignore the precalculated value if it is ridiculous */
		if (sbi->s_overhead > ext4_blocks_count(es))
		sbi->s_overhead = 0;
		/*
		* If the bigalloc feature is not enabled recalculating the
		* overhead doesn't take long, so we might as well just redo
		* it to make sure we are using the correct value.
		*/
		if (!ext4_has_feature_bigalloc(sb))
		sbi->s_overhead = 0;
		if (sbi->s_overhead == 0) {
		err = ext4_calculate_overhead(sb);
		if (err)
		goto failed_mount_wq;