提交 f3aa5653 编写于 作者: J John Garry 提交者: Zheng Zengkai

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

mainline inclusion
from mainline-v5.16-rc1
commit 1820f4f0
category: performance
bugzilla: 186917, https://gitee.com/openeuler/kernel/issues/I5N1S5
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1820f4f0a5e75633ff384167027bf45ed1b10234

--------------------------------

To be more concise and consistent in naming, rename
blk_mq_sched_free_requests() -> blk_mq_sched_free_rqs().
Signed-off-by: NJohn Garry <john.garry@huawei.com>
Reviewed-by: NHannes Reinecke <hare@suse.de>
Reviewed-by: NMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/1633429419-228500-7-git-send-email-john.garry@huawei.comSigned-off-by: NJens Axboe <axboe@kernel.dk>
Signed-off-by: NYu Kuai <yukuai3@huawei.com>
Reviewed-by: NYu Kuai <yukuai3@huawei.com>
Reviewed-by: NJason Yan <yanaijie@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 4e161e6a
...@@ -414,7 +414,7 @@ void blk_cleanup_queue(struct request_queue *q) ...@@ -414,7 +414,7 @@ void blk_cleanup_queue(struct request_queue *q)
*/ */
mutex_lock(&q->sysfs_lock); mutex_lock(&q->sysfs_lock);
if (q->elevator) if (q->elevator)
blk_mq_sched_free_requests(q); blk_mq_sched_free_rqs(q);
mutex_unlock(&q->sysfs_lock); mutex_unlock(&q->sysfs_lock);
percpu_ref_exit(&q->q_usage_counter); percpu_ref_exit(&q->q_usage_counter);
......
...@@ -630,7 +630,7 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e) ...@@ -630,7 +630,7 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e)
ret = e->ops.init_hctx(hctx, i); ret = e->ops.init_hctx(hctx, i);
if (ret) { if (ret) {
eq = q->elevator; eq = q->elevator;
blk_mq_sched_free_requests(q); blk_mq_sched_free_rqs(q);
blk_mq_exit_sched(q, eq); blk_mq_exit_sched(q, eq);
kobject_put(&eq->kobj); kobject_put(&eq->kobj);
return ret; return ret;
...@@ -645,7 +645,7 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e) ...@@ -645,7 +645,7 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e)
if (blk_mq_is_sbitmap_shared(q->tag_set->flags)) if (blk_mq_is_sbitmap_shared(q->tag_set->flags))
blk_mq_exit_sched_shared_sbitmap(q); blk_mq_exit_sched_shared_sbitmap(q);
err_free_map_and_rqs: err_free_map_and_rqs:
blk_mq_sched_free_requests(q); blk_mq_sched_free_rqs(q);
blk_mq_sched_tags_teardown(q); blk_mq_sched_tags_teardown(q);
q->elevator = NULL; q->elevator = NULL;
return ret; return ret;
...@@ -655,7 +655,7 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e) ...@@ -655,7 +655,7 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e)
* called in either blk_queue_cleanup or elevator_switch, tagset * called in either blk_queue_cleanup or elevator_switch, tagset
* is required for freeing requests * 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; struct blk_mq_hw_ctx *hctx;
int i; int i;
......
...@@ -29,7 +29,7 @@ void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx); ...@@ -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); 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_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 static inline bool
blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio, blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio,
......
...@@ -212,7 +212,7 @@ static inline void elevator_exit(struct request_queue *q, ...@@ -212,7 +212,7 @@ static inline void elevator_exit(struct request_queue *q,
{ {
lockdep_assert_held(&q->sysfs_lock); lockdep_assert_held(&q->sysfs_lock);
blk_mq_sched_free_requests(q); blk_mq_sched_free_rqs(q);
__elevator_exit(q, e); __elevator_exit(q, e);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册