diff options
| author | Ming Lei <ming.lei@redhat.com> | 2022-07-11 11:08:08 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-07-12 14:52:27 +0200 |
| commit | f3ec5d11554778c24ac8915e847223ed71d104fc (patch) | |
| tree | 75c5ca81268b791001468c28d9a9cea1bd5f4d8c /block | |
| parent | block: move zone related fields to struct gendisk (diff) | |
| download | linux-f3ec5d11554778c24ac8915e847223ed71d104fc.tar.xz linux-f3ec5d11554778c24ac8915e847223ed71d104fc.zip | |
blk-mq: don't create hctx debugfs dir until q->debugfs_dir is created
blk_mq_debugfs_register_hctx() can be called by blk_mq_update_nr_hw_queues
when gendisk isn't added yet, such as nvme tcp.
Fixes the warning of 'debugfs: Directory 'hctx0' with parent '/' already present!'
which can be observed reliably when running blktests nvme/005.
Fixes: 6cfc0081b046 ("blk-mq: no need to check return value of debugfs_create functions")
Reported-by: Yi Zhang <yi.zhang@redhat.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Tested-by: Yi Zhang <yi.zhang@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220711090808.259682-1-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq-debugfs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index b11add9a95e2..7ee1b13380d0 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -728,6 +728,9 @@ void blk_mq_debugfs_register_hctx(struct request_queue *q, char name[20]; int i; + if (!q->debugfs_dir) + return; + snprintf(name, sizeof(name), "hctx%u", hctx->queue_num); hctx->debugfs_dir = debugfs_create_dir(name, q->debugfs_dir); |