Merge branch 'next-lsm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

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

diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index 748164f4e8b1c7333823d2ade1bb5232f53d6827..b3f2ba483992d2a1afad8a80084abfa77f26b92f 100644 (file)
--- a/block/blk-mq-debugfs.c
+++ b/block/blk-mq-debugfs.c
@@ -918,6 +918,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;