Skip to content

Commit

Permalink
blk-mq-debugfs: Rename functions for registering and unregistering th…
Browse files Browse the repository at this point in the history 
…e mq directory

Since the blk_mq_debugfs_*register_hctxs() functions register and
unregister all attributes under the "mq" directory, rename these
into blk_mq_debugfs_*register_mq().

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
  • Loading branch information
Bart Van Assche authored and Jens Axboe committed Apr 26, 2017
1 parent 4c9e401 commit 62d6c94
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions block/blk-mq-debugfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ int blk_mq_debugfs_register(struct request_queue *q)
if (!q->debugfs_dir)
goto err;

if (blk_mq_debugfs_register_hctxs(q))
if (blk_mq_debugfs_register_mq(q))
goto err;

return 0;
Expand Down Expand Up @@ -865,7 +865,7 @@ static int blk_mq_debugfs_register_hctx(struct request_queue *q,
return 0;
}

int blk_mq_debugfs_register_hctxs(struct request_queue *q)
int blk_mq_debugfs_register_mq(struct request_queue *q)
{
struct blk_mq_hw_ctx *hctx;
int i;
Expand All @@ -891,11 +891,11 @@ int blk_mq_debugfs_register_hctxs(struct request_queue *q)
return 0;

err:
blk_mq_debugfs_unregister_hctxs(q);
blk_mq_debugfs_unregister_mq(q);
return -ENOMEM;
}

void blk_mq_debugfs_unregister_hctxs(struct request_queue *q)
void blk_mq_debugfs_unregister_mq(struct request_queue *q)
{
debugfs_remove_recursive(q->mq_debugfs_dir);
q->mq_debugfs_dir = NULL;
Expand Down
6 changes: 3 additions & 3 deletions block/blk-mq-sysfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ static void __blk_mq_unregister_dev(struct device *dev, struct request_queue *q)
queue_for_each_hw_ctx(q, hctx, i)
blk_mq_unregister_hctx(hctx);

blk_mq_debugfs_unregister_hctxs(q);
blk_mq_debugfs_unregister_mq(q);

kobject_uevent(&q->mq_kobj, KOBJ_REMOVE);
kobject_del(&q->mq_kobj);
Expand Down Expand Up @@ -356,7 +356,7 @@ void blk_mq_sysfs_unregister(struct request_queue *q)
if (!q->mq_sysfs_init_done)
goto unlock;

blk_mq_debugfs_unregister_hctxs(q);
blk_mq_debugfs_unregister_mq(q);

queue_for_each_hw_ctx(q, hctx, i)
blk_mq_unregister_hctx(hctx);
Expand All @@ -374,7 +374,7 @@ int blk_mq_sysfs_register(struct request_queue *q)
if (!q->mq_sysfs_init_done)
goto unlock;

blk_mq_debugfs_register_hctxs(q);
blk_mq_debugfs_register_mq(q);

queue_for_each_hw_ctx(q, hctx, i) {
ret = blk_mq_register_hctx(hctx);
Expand Down
8 changes: 4 additions & 4 deletions block/blk-mq.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ extern void blk_mq_hctx_kobj_init(struct blk_mq_hw_ctx *hctx);
#ifdef CONFIG_BLK_DEBUG_FS
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);
int blk_mq_debugfs_register_mq(struct request_queue *q);
void blk_mq_debugfs_unregister_mq(struct request_queue *q);
#else
static inline int blk_mq_debugfs_register(struct request_queue *q)
{
Expand All @@ -101,12 +101,12 @@ static inline void blk_mq_debugfs_unregister(struct request_queue *q)
{
}

static inline int blk_mq_debugfs_register_hctxs(struct request_queue *q)
static inline int blk_mq_debugfs_register_mq(struct request_queue *q)
{
return 0;
}

static inline void blk_mq_debugfs_unregister_hctxs(struct request_queue *q)
static inline void blk_mq_debugfs_unregister_mq(struct request_queue *q)
{
}
#endif
Expand Down

0 comments on commit 62d6c94

Please sign in to comment.