diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-06 11:48:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-06 11:48:39 -0700 |
| commit | 46713c3d2f8da5e3d8ddd2249bcb1d9974fb5d28 (patch) | |
| tree | 85bf3562082388968bb831dcf9ea2d004fef1147 | |
| parent | bcc0e65f47def010d8d1c4cf09bdc698fe061b77 (diff) | |
| parent | 7e41c3c9b6ceb2da52ba9d2b328d1851f269a48e (diff) | |
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
| -rw-r--r-- | block/blk-mq-debugfs.c | 7 |
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; |