Merge tag 'for-linus-20190706' of git://git.kernel.dk/linux-block

Pull block fix from Jens Axboe:
 "Just a single fix for a patch from Greg KH, which reportedly break
  block debugfs locations for certain setups. Trivial enough that I
  think we should include it now, rather than wait and release 5.2 with
  it, since it's a regression in this series"

* tag 'for-linus-20190706' of git://git.kernel.dk/linux-block:
  blk-mq: fix up placement of debugfs directory of queue files

diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index 2489ddb..3afe327 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;