diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 548d758365c632852a2c9f2ba630b5fba4aa2bf6..b809c0bf76868b1bf66ae987dc2912af841426fa 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -821,38 +821,6 @@ struct kobj_type blk_queue_ktype = {
 	.release	= blk_release_queue,
 };
 
-static void disk_scan_partitions(struct gendisk *disk)
-{
-	struct block_device *bdev;
-
-	if (!get_capacity(disk) || !disk_part_scan_enabled(disk))
-		return;
-
-	set_bit(GD_NEED_PART_SCAN, &disk->state);
-	bdev = blkdev_get_by_dev(disk_devt(disk), FMODE_READ, NULL);
-	if (!IS_ERR(bdev))
-		blkdev_put(bdev, FMODE_READ);
-}
-
-static void disk_init_partition(struct gendisk *disk)
-{
-	struct device *ddev = disk_to_dev(disk);
-	struct disk_part_iter piter;
-	struct hd_struct *part;
-
-	disk_scan_partitions(disk);
-
-	/* announce disk after possible partitions are created */
-	dev_set_uevent_suppress(ddev, 0);
-	kobject_uevent(&ddev->kobj, KOBJ_ADD);
-
-	/* announce possible partitions */
-	disk_part_iter_init(&piter, disk, 0);
-	while ((part = disk_part_iter_next(&piter)))
-		kobject_uevent(&part_to_dev(part)->kobj, KOBJ_ADD);
-	disk_part_iter_exit(&piter);
-}
-
 /**
  * blk_register_queue - register a block layer queue with sysfs
  * @disk: Disk of which the request queue should be registered with sysfs.
@@ -942,22 +910,9 @@ int blk_register_queue(struct gendisk *disk)
 		kobject_uevent(&q->elevator->kobj, KOBJ_ADD);
 	mutex_unlock(&q->sysfs_lock);
 
-
-	/*
-	 * Set the flag at last, so that block devcie can't be opened
-	 * before it's registration is done.
-	 */
-	disk->flags |= GENHD_FL_UP;
 	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;
 }
diff --git a/block/genhd.c b/block/genhd.c
index 021c9c2d7231ae1fad4f656be0c48bac7b14d675..70e24c554b315e759ea10c7a3fff19afa3ab4e88 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -736,6 +736,38 @@ static void register_disk(struct device *parent, struct gendisk *disk,
 	}
 }
 
+static void disk_scan_partitions(struct gendisk *disk)
+{
+	struct block_device *bdev;
+
+	if (!get_capacity(disk) || !disk_part_scan_enabled(disk))
+		return;
+
+	set_bit(GD_NEED_PART_SCAN, &disk->state);
+	bdev = blkdev_get_by_dev(disk_devt(disk), FMODE_READ, NULL);
+	if (!IS_ERR(bdev))
+		blkdev_put(bdev, FMODE_READ);
+}
+
+static void disk_init_partition(struct gendisk *disk)
+{
+	struct device *ddev = disk_to_dev(disk);
+	struct disk_part_iter piter;
+	struct hd_struct *part;
+
+	disk_scan_partitions(disk);
+
+	/* announce disk after possible partitions are created */
+	dev_set_uevent_suppress(ddev, 0);
+	kobject_uevent(&ddev->kobj, KOBJ_ADD);
+
+	/* announce possible partitions */
+	disk_part_iter_init(&piter, disk, 0);
+	while ((part = disk_part_iter_next(&piter)))
+		kobject_uevent(&part_to_dev(part)->kobj, KOBJ_ADD);
+	disk_part_iter_exit(&piter);
+}
+
 /**
  * __device_add_disk - add disk information to kernel list
  * @parent: parent device for the disk
@@ -814,6 +846,13 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
 
 	disk_add_events(disk);
 	blk_integrity_add(disk);
+
+	/*
+	 * Set the flag at last, so that block devcie can't be opened
+	 * before it's registration is done.
+	 */
+	disk->flags |= GENHD_FL_UP;
+	disk_init_partition(disk);
 }
 
 void device_add_disk(struct device *parent, struct gendisk *disk,