diff options
| author | Bart Van Assche <bart.vanassche@sandisk.com> | 2017-04-26 13:47:49 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-26 15:09:04 -0600 |
| commit | 4c9e4019f1880bea7ae6e9603d14c2ed0f1c4e23 (patch) | |
| tree | 2c82638c517be9601808ab270d1d3bc423831a7b /block | |
| parent | 2d0364c8c1a97a1d44760895a982221c06af0f35 (diff) | |
| download | linux-0-day-4c9e4019f1880bea7ae6e9603d14c2ed0f1c4e23.tar.gz linux-0-day-4c9e4019f1880bea7ae6e9603d14c2ed0f1c4e23.tar.xz | |
blk-mq: Let blk_mq_debugfs_register() look up the queue name
A later patch will move the call of blk_mq_debugfs_register() to
a function to which the queue name is not passed as an argument.
To avoid having to add a 'name' argument to multiple callers, let
blk_mq_debugfs_register() look up the queue name.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq-debugfs.c | 5 | ||||
| -rw-r--r-- | block/blk-mq-sysfs.c | 2 | ||||
| -rw-r--r-- | block/blk-mq.h | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 3057641d5d152..e9282b945f6b0 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -785,12 +785,13 @@ static const struct blk_mq_debugfs_attr blk_mq_debugfs_ctx_attrs[] = { {}, }; -int blk_mq_debugfs_register(struct request_queue *q, const char *name) +int blk_mq_debugfs_register(struct request_queue *q) { if (!blk_debugfs_root) return -ENOENT; - q->debugfs_dir = debugfs_create_dir(name, blk_debugfs_root); + q->debugfs_dir = debugfs_create_dir(kobject_name(q->kobj.parent), + blk_debugfs_root); if (!q->debugfs_dir) goto err; diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c index a2dbb1a48e727..afb3451cf8a52 100644 --- a/block/blk-mq-sysfs.c +++ b/block/blk-mq-sysfs.c @@ -318,7 +318,7 @@ int __blk_mq_register_dev(struct device *dev, struct request_queue *q) kobject_uevent(&q->mq_kobj, KOBJ_ADD); - blk_mq_debugfs_register(q, kobject_name(&dev->kobj)); + blk_mq_debugfs_register(q); queue_for_each_hw_ctx(q, hctx, i) { ret = blk_mq_register_hctx(hctx); diff --git a/block/blk-mq.h b/block/blk-mq.h index 7d955c756810a..9049c0f11505c 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -87,13 +87,12 @@ extern void blk_mq_hctx_kobj_init(struct blk_mq_hw_ctx *hctx); * debugfs helpers */ #ifdef CONFIG_BLK_DEBUG_FS -int blk_mq_debugfs_register(struct request_queue *q, const char *name); +int blk_mq_debugfs_register(struct request_queue *q); void blk_mq_debugfs_unregister(struct request_queue *q); int blk_mq_debugfs_register_hctxs(struct request_queue *q); void blk_mq_debugfs_unregister_hctxs(struct request_queue *q); #else -static inline int blk_mq_debugfs_register(struct request_queue *q, - const char *name) +static inline int blk_mq_debugfs_register(struct request_queue *q) { return 0; } |