diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index fecbf5c2de3f4d688663f13d953f318ee1c5d876..8badd7dc79c2f7817a80d75ddd2997d6aa630a01 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -4844,6 +4844,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
 	INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */
 	mutex_init(&sbi->s_orphan_lock);
 
+	spin_lock_init(&sbi->s_bdev_wb_lock);
+
 	/* Initialize fast commit stuff */
 	atomic_set(&sbi->s_fc_subtid, 0);
 	atomic_set(&sbi->s_fc_ineligible_updates, 0);
@@ -5160,7 +5162,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
 	 * Save the original bdev mapping's wb_err value which could be
 	 * used to detect the metadata async write error.
 	 */
-	spin_lock_init(&sbi->s_bdev_wb_lock);
 	errseq_check_and_advance(&sb->s_bdev->bd_inode->i_mapping->wb_err,
 				 &sbi->s_bdev_wb_err);
 	sb->s_bdev->bd_super = sb;