diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 1b00c8f5c9d6882b2b2446d993ab0e65bec30e58..1c4d795bbdc47df56b39a71aa4a20640f1e1a2fb 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -976,7 +976,7 @@ int blk_register_queue(struct gendisk *disk)
 	blk_queue_flag_set(QUEUE_FLAG_REGISTERED, q);
 	wbt_enable_default(q);
 	blk_throtl_register_queue(q);
-	blk_queue_flag_set(QUEUE_FLAG_THROTL_INIT_DONE, q);
+	blk_queue_flag_set(QUEUE_FLAG_REGISTER_DONE, q);
 
 	/* Now everything is ready and send out KOBJ_ADD uevent */
 	kobject_uevent(&q->kobj, KOBJ_ADD);
@@ -1025,7 +1025,7 @@ void blk_unregister_queue(struct gendisk *disk)
 	if (!test_bit(QUEUE_FLAG_REGISTERED, &q->queue_flags))
 		return;
 
-	blk_queue_flag_clear(QUEUE_FLAG_THROTL_INIT_DONE, q);
+	blk_queue_flag_clear(QUEUE_FLAG_REGISTER_DONE, q);
 	/*
 	 * Since sysfs_remove_dir() prevents adding new directory entries
 	 * before removal of existing entries starts, protect against
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 1c5ac48a9de89415478baa993bc51c1851e68f21..5981912865572f455f63750d009473f0a0a372fc 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -1493,7 +1493,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 d8a10f477558afc52e721f00b8c22be01fc4b2ae..e072d1ef16efcc0670c18af0d07279d6196e2036 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1173,6 +1173,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 41d235ee579ae91bc55f0504ce243b36cf54f5cb..c848f4205729ec722877f2b324ed68a890e50546 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -713,7 +713,7 @@ struct request_queue {
 #define QUEUE_FLAG_NOMERGES     5	/* disable merge attempts */
 #define QUEUE_FLAG_SAME_COMP	6	/* complete on same CPU-group */
 #define QUEUE_FLAG_FAIL_IO	7	/* fake timeout */
-#define QUEUE_FLAG_THROTL_INIT_DONE 8	/* io throttle can be online */
+#define QUEUE_FLAG_REGISTER_DONE 8	/* blkdev can be opened */
 #define QUEUE_FLAG_NONROT	9	/* non-rotational device (SSD) */
 #define QUEUE_FLAG_VIRT        QUEUE_FLAG_NONROT /* paravirt device */
 #define QUEUE_FLAG_IO_STAT     10	/* do IO stats */