Re: [PATCH RESEND v3 05/13] blk-mq-sched: Rename blk_mq_sched_alloc_{tags -> map_and_rqs}()

[Hannes Reinecke]

On 9/13/21 5:12 PM, John Garry wrote:
> Function blk_mq_sched_alloc_tags() does same as
> __blk_mq_alloc_map_and_request(), so give a similar name to be consistent.
>
> Similarly rename label err_free_tags -> err_free_map_and_rqs.
>
> Signed-off-by: John Garry <john.garry@xxxxxxxxxx>
> Reviewed-by: Ming Lei <ming.lei@xxxxxxxxxx>
> ---
>   block/blk-mq-sched.c | 14 +++++++-------
>   1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
> index 2231fb0d4c35..5f340203e6e5 100644
> --- a/block/blk-mq-sched.c
> +++ b/block/blk-mq-sched.c
> @@ -515,9 +515,9 @@ void blk_mq_sched_insert_requests(struct blk_mq_hw_ctx *hctx,
>   	percpu_ref_put(&q->q_usage_counter);
>   }
>   
> -static int blk_mq_sched_alloc_tags(struct request_queue *q,
> -				   struct blk_mq_hw_ctx *hctx,
> -				   unsigned int hctx_idx)
> +static int blk_mq_sched_alloc_map_and_rqs(struct request_queue *q,
> +					  struct blk_mq_hw_ctx *hctx,
> +					  unsigned int hctx_idx)
>   {
>   	struct blk_mq_tag_set *set = q->tag_set;
>   	int ret;
> @@ -609,15 +609,15 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e)
>   				   BLKDEV_DEFAULT_RQ);
>   
>   	queue_for_each_hw_ctx(q, hctx, i) {
> -		ret = blk_mq_sched_alloc_tags(q, hctx, i);
> +		ret = blk_mq_sched_alloc_map_and_rqs(q, hctx, i);
>   		if (ret)
> -			goto err_free_tags;
> +			goto err_free_map_and_rqs;
>   	}
>   
>   	if (blk_mq_is_sbitmap_shared(q->tag_set->flags)) {
>   		ret = blk_mq_init_sched_shared_sbitmap(q);
>   		if (ret)
> -			goto err_free_tags;
> +			goto err_free_map_and_rqs;
>   	}
>   
>   	ret = e->ops.init_sched(q, e);
> @@ -645,8 +645,8 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e)
>   err_free_sbitmap:
>   	if (blk_mq_is_sbitmap_shared(q->tag_set->flags))
>   		blk_mq_exit_sched_shared_sbitmap(q);
> -err_free_tags:
>   	blk_mq_sched_free_requests(q);
> +err_free_map_and_rqs:
>   	blk_mq_sched_tags_teardown(q);
>   	q->elevator = NULL;
>   	return ret;
This is not only a rename, but it also moves the location of the label.
Is that intended?
If so it needs some documentation why this is safe.

Cheers,

Hannes
--
Dr. Hannes Reinecke                Kernel Storage Architect
hare@xxxxxxx                              +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer