[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 23dfdb56581ad92a9967bcd720c8c23356af74c1
WARNING: Author mismatch between patch and upstream commit: Backport author: jianqi.ren.cn@windriver.com Commit author: Luis Henriques (SUSE) luis.henriques@linux.dev
Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.6.y | Not found 6.1.y | Not found
Note: The patch differs from the upstream commit: --- 1: 23dfdb56581ad ! 1: df7ded8c165b0 ext4: fix access to uninitialised lock in fc replay path @@ Metadata ## Commit message ## ext4: fix access to uninitialised lock in fc replay path
+ [ commit 23dfdb56581ad92a9967bcd720c8c23356af74c1 upstream ] + The following kernel trace can be triggered with fstest generic/629 when executed against a filesystem with fast-commit feature enabled:
@@ Commit message Link: https://patch.msgid.link/20240718094356.7863-1-luis.henriques@linux.dev Signed-off-by: Theodore Ts'o tytso@mit.edu Cc: stable@kernel.org + Signed-off-by: Jianqi Ren jianqi.ren.cn@windriver.com
## fs/ext4/super.c ## @@ fs/ext4/super.c: static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) @@ fs/ext4/super.c: static int __ext4_fill_super(struct fs_context *fc, struct supe * used to detect the metadata async write error. */ - spin_lock_init(&sbi->s_bdev_wb_lock); - errseq_check_and_advance(&sb->s_bdev->bd_mapping->wb_err, + errseq_check_and_advance(&sb->s_bdev->bd_inode->i_mapping->wb_err, &sbi->s_bdev_wb_err); - EXT4_SB(sb)->s_mount_state |= EXT4_ORPHAN_FS; + sb->s_bdev->bd_super = sb; ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.1.y | Success | Success |