Fixes for 5.15

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.15/ext4-fix-bad-checksum-after-online-resize.patch b/queue-5.15/ext4-fix-bad-checksum-after-online-resize.patch
new file mode 100644 (file)
index 0000000..1ea233b
--- /dev/null
+++ b/queue-5.15/ext4-fix-bad-checksum-after-online-resize.patch
@@ -0,0 +1,60 @@
+From feefae41e03c249e4d62e97659c3e3f6754db737 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 30 Jan 2023 23:52:12 +0000
+Subject: ext4: fix bad checksum after online resize
+
+From: Baokun Li <libaokun1@huawei.com>
+
+commit a408f33e895e455f16cf964cb5cd4979b658db7b upstream.
+
+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: 026d0d27c488 ("ext4: reduce computation of overhead during resize")
+Fixes: de394a86658f ("ext4: update s_overhead_clusters in the superblock during an on-line resize")
+Signed-off-by: Baokun Li <libaokun1@huawei.com>
+Reviewed-by: Darrick J. Wong <djwong@kernel.org>
+Reviewed-by: Jan Kara <jack@suse.cz>
+Cc: stable@kernel.org
+Link: https://lore.kernel.org/r/20221117040341.1380702-2-libaokun1@huawei.com
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Signed-off-by: Oleksandr Tymoshenko <ovt@google.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ fs/ext4/resize.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
+index 405c68085055..589ed99856f3 100644
+--- a/fs/ext4/resize.c
++++ b/fs/ext4/resize.c
+@@ -1445,8 +1445,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,
+@@ -1474,6 +1472,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,
+-- 
+2.39.0
+

diff --git a/queue-5.15/series b/queue-5.15/series
index eaf289101b400a4950c974c808caf77fd79cf4f9..2a7f0a132eb5d05a37e74cb73ccbcf063d98a8e8 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -9,3 +9,4 @@ blk-cgroup-fix-missing-pd_online_fn-while-activating.patch
 hid-playstation-sanity-check-dualsense-calibration-d.patch
 dmaengine-imx-sdma-fix-a-possible-memory-leak-in-sdm.patch
 cifs-fix-return-of-uninitialized-rc-in-dfs_cache_upd.patch
+ext4-fix-bad-checksum-after-online-resize.patch