[ Sasha's backport helper bot ] Hi, The upstream commit SHA1 provided is correct: b4b4fda34e535756f9e774fb2d09c4537b7dfd1c WARNING: Author mismatch between patch and upstream commit: Backport author: bin.lan.cn@xxxxxxxxxxxxxxxxx Commit author: Baokun Li <libaokun1@xxxxxxxxxx> Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.6.y | Present (different SHA1: 23afcd52af06) 6.1.y | Not found Note: The patch differs from the upstream commit: --- 1: b4b4fda34e535 ! 1: 5f07a4e2bb575 ext4: fix uninitialized ratelimit_state->lock access in __ext4_fill_super() @@ Metadata ## Commit message ## ext4: fix uninitialized ratelimit_state->lock access in __ext4_fill_super() + [ Upstream commit b4b4fda34e535756f9e774fb2d09c4537b7dfd1c ] + In the following concurrency we will access the uninitialized rs->lock: ext4_fill_super @@ Commit message Reviewed-by: Jan Kara <jack@xxxxxxx> Link: https://lore.kernel.org/r/20240102133730.1098120-1-libaokun1@xxxxxxxxxx Signed-off-by: Theodore Ts'o <tytso@xxxxxxx> + [ Resolve merge conflicts ] + Signed-off-by: Bin Lan <bin.lan.cn@xxxxxxxxxxxxx> ## 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 -failed_mount10: +failed_mount9: - ext4_quotas_off(sb, EXT4_MAXQUOTAS); + ext4_quota_off_umount(sb); -failed_mount9: __maybe_unused +failed_mount8: __maybe_unused ext4_release_orphan_info(sb); --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.1.y | Success | Success |