blk-mq-sched: Rename blk_mq_sched_free_{requests -> rqs}()

To be more concise and consistent in naming, rename
blk_mq_sched_free_requests() -> blk_mq_sched_free_rqs().

Signed-off-by: John Garry <john.garry@huawei.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/1633429419-228500-7-git-send-email-john.garry@huawei.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-core.c b/block/blk-core.c
index 2590e77..0ed1754 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -403,7 +403,7 @@ void blk_cleanup_queue(struct request_queue *q)
         */
        mutex_lock(&q->sysfs_lock);
        if (q->elevator)
-               blk_mq_sched_free_requests(q);
+               blk_mq_sched_free_rqs(q);
        mutex_unlock(&q->sysfs_lock);
 
        percpu_ref_exit(&q->q_usage_counter);

diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 644b6d5..bdbb6c3 100644 (file)
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -631,7 +631,7 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e)
                        ret = e->ops.init_hctx(hctx, i);
                        if (ret) {
                                eq = q->elevator;
-                               blk_mq_sched_free_requests(q);
+                               blk_mq_sched_free_rqs(q);
                                blk_mq_exit_sched(q, eq);
                                kobject_put(&eq->kobj);
                                return ret;
@@ -646,7 +646,7 @@ err_free_sbitmap:
        if (blk_mq_is_sbitmap_shared(q->tag_set->flags))
                blk_mq_exit_sched_shared_sbitmap(q);
 err_free_map_and_rqs:
-       blk_mq_sched_free_requests(q);
+       blk_mq_sched_free_rqs(q);
        blk_mq_sched_tags_teardown(q);
        q->elevator = NULL;
        return ret;
@@ -656,7 +656,7 @@ err_free_map_and_rqs:
  * called in either blk_queue_cleanup or elevator_switch, tagset
  * is required for freeing requests
  */
-void blk_mq_sched_free_requests(struct request_queue *q)
+void blk_mq_sched_free_rqs(struct request_queue *q)
 {
        struct blk_mq_hw_ctx *hctx;
        int i;

diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h
index f6a1ce9..e4d367e 100644 (file)
--- a/block/blk-mq-sched.h
+++ b/block/blk-mq-sched.h
@@ -29,7 +29,7 @@ void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx);
 
 int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e);
 void blk_mq_exit_sched(struct request_queue *q, struct elevator_queue *e);
-void blk_mq_sched_free_requests(struct request_queue *q);
+void blk_mq_sched_free_rqs(struct request_queue *q);
 
 static inline bool
 blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio,

diff --git a/block/blk.h b/block/blk.h
index fa90691..8cdee48 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -242,7 +242,7 @@ static inline void elevator_exit(struct request_queue *q,
 {
        lockdep_assert_held(&q->sysfs_lock);
 
-       blk_mq_sched_free_requests(q);
+       blk_mq_sched_free_rqs(q);
        __elevator_exit(q, e);
 }