diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index db7c0503bead064b8f7d0c4b47f02e160e9041a3..c95be9626a09807a07d8b5563540edd3e7a80de7 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -908,7 +908,7 @@ int blk_register_queue(struct gendisk *disk)
 	wbt_enable_default(q);
 	blk_throtl_register_queue(q);
 	spin_lock_irq(&q->queue_lock);
-	blk_queue_flag_set(QUEUE_FLAG_THROTL_INIT_DONE, q);
+	blk_queue_flag_set(QUEUE_FLAG_REGISTER_DONE, q);
 	spin_unlock_irq(&q->queue_lock);
 
 	/* Now everything is ready and send out KOBJ_ADD uevent */
@@ -944,7 +944,7 @@ void blk_unregister_queue(struct gendisk *disk)
 		return;
 
 	spin_lock_irq(&q->queue_lock);
-	blk_queue_flag_clear(QUEUE_FLAG_THROTL_INIT_DONE, q);
+	blk_queue_flag_clear(QUEUE_FLAG_REGISTER_DONE, q);
 	spin_unlock_irq(&q->queue_lock);
 
 	/*
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 2686634d2cc4b7c5016f21353ce79db0e8c6c634..42ce18f991c4c90fb4e6443de8fe3ccbe98c17be 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -1518,7 +1518,7 @@ static void tg_conf_updated(struct throtl_grp *tg, u64 *old_limits, bool global)
 
 static inline int throtl_check_init_done(struct request_queue *q)
 {
-	if (test_bit(QUEUE_FLAG_THROTL_INIT_DONE, &q->queue_flags))
+	if (test_bit(QUEUE_FLAG_REGISTER_DONE, &q->queue_flags))
 		return 0;
 
 	return blk_queue_dying(q) ? -ENODEV : -EBUSY;
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 1c56cddcaa3d02e6d00cd34b5244357595bb4c59..a0e4d3ec300ea2e69592b040d2a395c0d17dae92 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1136,6 +1136,12 @@ static struct gendisk *bdev_get_gendisk(struct block_device *bdev, int *partno)
 
 	if (!disk)
 		return NULL;
+
+	if (!test_bit(QUEUE_FLAG_REGISTER_DONE, &disk->queue->queue_flags)) {
+		put_disk_and_module(disk);
+		return NULL;
+	}
+
 	/*
 	 * Now that we hold gendisk reference we make sure bdev we looked up is
 	 * not stale. If it is, it means device got removed and created before
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 9ede0a81e46676b5f445726482e15ddc98d55cf7..93f1a7586f8612c39afe797f2b4a9dfe9ac307dd 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -612,7 +612,7 @@ struct request_queue {
 /* Keep blk_queue_flag_name[] in sync with the definitions below */
 #define QUEUE_FLAG_STOPPED	0	/* queue is stopped */
 #define QUEUE_FLAG_DYING	1	/* queue being torn down */
-#define QUEUE_FLAG_THROTL_INIT_DONE 2	/* io throttle can be online */
+#define QUEUE_FLAG_REGISTER_DONE 2	/* blkdev can be got */
 #define QUEUE_FLAG_NOMERGES     3	/* disable merge attempts */
 #define QUEUE_FLAG_SAME_COMP	4	/* complete on same CPU-group */
 #define QUEUE_FLAG_FAIL_IO	5	/* fake timeout */