blk-mq: rename blk_mq_sysfs_{,un}register

Add a _hctx postifx to better describe what the functions do, match
the debugfs equivalents and release the old names for functions that
should be using them.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index f4caaa668e3cfd418109e4c774915b36fabb5a47..ee6efe2b250d2e2e814cb025e1126f4979ba77f9 100644 (file)
--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -288,7 +288,7 @@ unreg:
        return ret;
 }
 
-void blk_mq_sysfs_unregister(struct request_queue *q)
+void blk_mq_sysfs_unregister_hctxs(struct request_queue *q)
 {
        struct blk_mq_hw_ctx *hctx;
        unsigned long i;
@@ -304,7 +304,7 @@ unlock:
        mutex_unlock(&q->sysfs_dir_lock);
 }
 
-int blk_mq_sysfs_register(struct request_queue *q)
+int blk_mq_sysfs_register_hctxs(struct request_queue *q)
 {
        struct blk_mq_hw_ctx *hctx;
        unsigned long i;

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 784b8f35edca4aaa2c425c6713d4561bb728ae9c..56139db8284798e269c76e7507267dcab3760e00 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -4547,7 +4547,7 @@ static void __blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set,
 
        list_for_each_entry(q, &set->tag_list, tag_set_list) {
                blk_mq_debugfs_unregister_hctxs(q);
-               blk_mq_sysfs_unregister(q);
+               blk_mq_sysfs_unregister_hctxs(q);
        }
 
        prev_nr_hw_queues = set->nr_hw_queues;
@@ -4578,7 +4578,7 @@ fallback:
 
 reregister:
        list_for_each_entry(q, &set->tag_list, tag_set_list) {
-               blk_mq_sysfs_register(q);
+               blk_mq_sysfs_register_hctxs(q);
                blk_mq_debugfs_register_hctxs(q);
        }
 

diff --git a/block/blk-mq.h b/block/blk-mq.h
index 2615bd58bad3cbc79333948a60f5a35253ccfcc4..bed34061c3a0be731d0768f28d37d5b25d2e5dd5 100644 (file)
--- a/block/blk-mq.h
+++ b/block/blk-mq.h
@@ -119,8 +119,8 @@ static inline struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *q,
 extern void blk_mq_sysfs_init(struct request_queue *q);
 extern void blk_mq_sysfs_deinit(struct request_queue *q);
 extern int __blk_mq_register_dev(struct device *dev, struct request_queue *q);
-extern int blk_mq_sysfs_register(struct request_queue *q);
-extern void blk_mq_sysfs_unregister(struct request_queue *q);
+int blk_mq_sysfs_register_hctxs(struct request_queue *q);
+void blk_mq_sysfs_unregister_hctxs(struct request_queue *q);
 extern void blk_mq_hctx_kobj_init(struct blk_mq_hw_ctx *hctx);
 void blk_mq_free_plug_rqs(struct blk_plug *plug);
 void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule);