Commit 44942478 authored by Baokun Li's avatar Baokun Li Committed by Zheng Zengkai
Browse files

ext4: fix bad checksum after online resize 

mainline inclusion
from mainline-v6.2-rc1
commit a408f33e
category: bugfix
bugzilla: 187935,https://gitee.com/src-openeuler/kernel/issues/I5ZR8Z
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a408f33e895e455f16cf964cb5cd4979b658db7b



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

When online resizing is performed twice consecutively, the error message
"Superblock checksum does not match superblock" is displayed for the
second time. Here's the reproducer:

	mkfs.ext4 -F /dev/sdb 100M
	mount /dev/sdb /tmp/test
	resize2fs /dev/sdb 5G
	resize2fs /dev/sdb 6G

To solve this issue, we moved the update of the checksum after the
es->s_overhead_clusters is updated.

Fixes: 026d0d27 ("ext4: reduce computation of overhead during resize")
Fixes: de394a86 ("ext4: update s_overhead_clusters in the superblock during an on-line resize")
Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Cc: stable@kernel.org
Link: https://lore.kernel.org/r/20221117040341.1380702-2-libaokun1@huawei.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>

Conflict:
	fs/ext4/resize.c

Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent 63307509

fs/ext4/resize.c

+2 −2
Original line number Diff line number Diff line
@@ -1440,8 +1440,6 @@ static void ext4_update_super(struct super_block *sb, 
	 * active. */

	ext4_r_blocks_count_set(es, ext4_r_blocks_count(es) +

				reserved_blocks);

	ext4_superblock_csum_set(sb);

	unlock_buffer(sbi->s_sbh);



	/* Update the free space counts */

	percpu_counter_add(&sbi->s_freeclusters_counter,
@@ -1469,6 +1467,8 @@ static void ext4_update_super(struct super_block *sb, 
	ext4_calculate_overhead(sb);

	es->s_overhead_clusters = cpu_to_le32(sbi->s_overhead);



	ext4_superblock_csum_set(sb);

	unlock_buffer(sbi->s_sbh);

	if (test_opt(sb, DEBUG))

		printk(KERN_DEBUG "EXT4-fs: added group %u:"

		       "%llu blocks(%llu free %llu reserved)\n", flex_gd->count,