Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH RESEND v3 05/13] blk-mq-sched: Rename
 blk_mq_sched_alloc_{tags -> map_and_rqs}()
To:     Hannes Reinecke <hare@suse.de>, <axboe@kernel.dk>
CC:     <linux-kernel@vger.kernel.org>, <linux-block@vger.kernel.org>,
        <ming.lei@redhat.com>, <linux-scsi@vger.kernel.org>
References: <1631545950-56586-1-git-send-email-john.garry@huawei.com>
 <1631545950-56586-6-git-send-email-john.garry@huawei.com>
 <bcbc3479-86f9-6d72-44a5-aacd4f03fcc2@suse.de>
From:   John Garry <john.garry@huawei.com>
Message-ID: <4a139bf3-d536-4f9c-8cd2-6fbd6da7d6c4@huawei.com>
Date:   Tue, 14 Sep 2021 09:10:47 +0100
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101
 Thunderbird/68.12.1
MIME-Version: 1.0
In-Reply-To: <bcbc3479-86f9-6d72-44a5-aacd4f03fcc2@suse.de>
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 8bit
Precedence: bulk


>> +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.

Yeah, I think you're right.

The final code in the series looks correct, but this is a transient 
breakage.

I'll fix it.

Thanks,
John