leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blk-mq-debugfs: Rename functions for registering and unregistering the mq directory

Browse Source 
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>
This commit is contained in:
Bart Van Assche 2017-04-26 13:47:50 -07:00 committed by Jens Axboe
parent 4c9e4019f1
commit 62d6c9496a
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block/blk-mq-debugfs.c
View File

@ -795,7 +795,7 @@ int blk_mq_debugfs_register(struct request_queue *q)
if (!q->debugfs_dir) if (!q->debugfs_dir)
goto err; goto err;
if (blk_mq_debugfs_register_hctxs(q)) if (blk_mq_debugfs_register_mq(q))
goto err; goto err;
return 0; return 0;
@ -865,7 +865,7 @@ static int blk_mq_debugfs_register_hctx(struct request_queue *q,
return 0; 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; struct blk_mq_hw_ctx *hctx;
int i; int i;
@ -891,11 +891,11 @@ int blk_mq_debugfs_register_hctxs(struct request_queue *q)
return 0; return 0;
err: err:
blk_mq_debugfs_unregister_hctxs(q); blk_mq_debugfs_unregister_mq(q);
return -ENOMEM; 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); debugfs_remove_recursive(q->mq_debugfs_dir);
q->mq_debugfs_dir = NULL; q->mq_debugfs_dir = NULL;

6
block/blk-mq-sysfs.c
View File

@ -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) queue_for_each_hw_ctx(q, hctx, i)
blk_mq_unregister_hctx(hctx); 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_uevent(&q->mq_kobj, KOBJ_REMOVE);
kobject_del(&q->mq_kobj); kobject_del(&q->mq_kobj);
@ -356,7 +356,7 @@ void blk_mq_sysfs_unregister(struct request_queue *q)
if (!q->mq_sysfs_init_done) if (!q->mq_sysfs_init_done)
goto unlock; goto unlock;
blk_mq_debugfs_unregister_hctxs(q); blk_mq_debugfs_unregister_mq(q);
queue_for_each_hw_ctx(q, hctx, i) queue_for_each_hw_ctx(q, hctx, i)
blk_mq_unregister_hctx(hctx); blk_mq_unregister_hctx(hctx);
@ -374,7 +374,7 @@ int blk_mq_sysfs_register(struct request_queue *q)
if (!q->mq_sysfs_init_done) if (!q->mq_sysfs_init_done)
goto unlock; goto unlock;
blk_mq_debugfs_register_hctxs(q); blk_mq_debugfs_register_mq(q);
queue_for_each_hw_ctx(q, hctx, i) { queue_for_each_hw_ctx(q, hctx, i) {
ret = blk_mq_register_hctx(hctx); ret = blk_mq_register_hctx(hctx);

8
block/blk-mq.h
View File

@ -89,8 +89,8 @@ extern void blk_mq_hctx_kobj_init(struct blk_mq_hw_ctx *hctx);
#ifdef CONFIG_BLK_DEBUG_FS #ifdef CONFIG_BLK_DEBUG_FS
int blk_mq_debugfs_register(struct request_queue *q); int blk_mq_debugfs_register(struct request_queue *q);
void blk_mq_debugfs_unregister(struct request_queue *q); void blk_mq_debugfs_unregister(struct request_queue *q);
int blk_mq_debugfs_register_hctxs(struct request_queue *q); int blk_mq_debugfs_register_mq(struct request_queue *q);
void blk_mq_debugfs_unregister_hctxs(struct request_queue *q); void blk_mq_debugfs_unregister_mq(struct request_queue *q);
#else #else
static inline int blk_mq_debugfs_register(struct request_queue *q) static inline int blk_mq_debugfs_register(struct request_queue *q)
{ {
@ -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; 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 #endif