Merge tag 'v5.2' into next

[linux.git] / block / blk-mq-debugfs.c

diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index 2489ddbb21dbd060313188da35212d5d56819d41..3afe327f816fba8209becb21d00c166039069529 100644 (file)
--- 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;