diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index f7cd16cec0ed3575ccb29ccd7b9d5c5badad544a..548d758365c632852a2c9f2ba630b5fba4aa2bf6 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -948,10 +948,17 @@ int blk_register_queue(struct gendisk *disk)
 	 * before it's registration is done.
 	 */
 	disk->flags |= GENHD_FL_UP;
-	disk_init_partition(disk);
 	ret = 0;
 unlock:
 	mutex_unlock(&q->sysfs_dir_lock);
+	/*
+	 * Init partitions after releasing 'sysfs_dir_lock', otherwise lockdep
+	 * will be confused because it will treat 'bd_mutex' from different
+	 * devices as the same lock.
+	 */
+	if (!ret)
+		disk_init_partition(disk);
+
 	return ret;
 }
 EXPORT_SYMBOL_GPL(blk_register_queue);