Commit 456e4454 authored by John Garry's avatar John Garry Committed by Zheng Zengkai
Browse files

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: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/1633429419-228500-7-git-send-email-john.garry@huawei.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 49bf36b8

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,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);

block/blk-mq-sched.c

+3 −3
Original line number Diff line number Diff line
@@ -630,7 +630,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;
@@ -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))

		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;
@@ -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

 * 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;

block/blk-mq-sched.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

block/blk.h

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,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);

}