diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-09 20:11:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-09 20:11:09 -0700 |
| commit | d93fa2ba64384a0bbee4ae7409d85fccb2cfcf14 (patch) | |
| tree | 8e55d9d74f46ce13e4299d23c23c72b9306798c1 /block/blk-mq-debugfs.c | |
| parent | d0e60206bea2dec46c0a28fd6b116646aa67c5ae (diff) | |
| parent | 529a86e063e9ff625c4ff247d8aa17d8072444fb (diff) | |
| download | linux-d93fa2ba64384a0bbee4ae7409d85fccb2cfcf14.tar.gz linux-d93fa2ba64384a0bbee4ae7409d85fccb2cfcf14.tar.bz2 linux-d93fa2ba64384a0bbee4ae7409d85fccb2cfcf14.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'block/blk-mq-debugfs.c')
| -rw-r--r-- | block/blk-mq-debugfs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 980e73095643..de294d775acf 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -815,10 +815,14 @@ int blk_mq_debugfs_register(struct request_queue *q) goto err; /* - * blk_mq_init_hctx() attempted to do this already, but q->debugfs_dir + * blk_mq_init_sched() attempted to do this already, but q->debugfs_dir * didn't exist yet (because we don't know what to name the directory * until the queue is registered to a gendisk). */ + if (q->elevator && !q->sched_debugfs_dir) + blk_mq_debugfs_register_sched(q); + + /* Similarly, blk_mq_init_hctx() couldn't do this previously. */ queue_for_each_hw_ctx(q, hctx, i) { if (!hctx->debugfs_dir && blk_mq_debugfs_register_hctx(q, hctx)) goto err; |