1 files changed, 7 insertions, 0 deletions

diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index 2489ddbb21db..3afe327f816f 100644
--- a/block/blk-mq-debugfs.c
+++ b/block/blk-mq-debugfs.c
@@ -934,6 +934,13 @@ void blk_mq_debugfs_register_sched(struct request_queue *q)
 {
         struct elevator_type *e = q->elevator->type;
 
+        /*
+         * If the parent directory has not been created yet, return, we will be
+         * called again later on and the directory/files will be created then.
+         */
+        if (!q->debugfs_dir)
+                return;
+
         if (!e->queue_debugfs_attrs)
                 return;