From patchwork Mon Aug 9 14:29:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 493874 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:396:0:0:0:0 with SMTP id y22csp2977203jap; Mon, 9 Aug 2021 07:38:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKfjoHc9zteqsgl6rOKkBW6sZCGv6jft3FPLv5vIw2DakZxSZh8xetBS/+q1EzHR9c/JQX X-Received: by 2002:a92:7d08:: with SMTP id y8mr572773ilc.111.1628519885558; Mon, 09 Aug 2021 07:38:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628519885; cv=none; d=google.com; s=arc-20160816; b=H/TVsUY4DcthBML8tbqysoQ6EJLXmz0TRCKoZdd+OSOGaXRTKcRCruSrWGCstbeNFa 5lUlT8cZzdoI52fzrHYt0bOFFmNdLaVqX2jl7XXpHHRSoX86DllS/LlAL/uvo2fSwcwx GOcr68V0CX91z6Ni06/jZoJvlHSyZIpn3XEUJcocURfR01Ku+U2GxbvM5O1uTAbGWmSv lSdlDjG/4yx8RNDBA8rb5wq6rwSwWgWpKZAFgPhhp97NYITu4M7tqrxNFSClQos3kEU3 dbwZtAxSD1IOse3C1mJ3hhLSceZ5kcEgsGCsNWQlbOqVv364+1UjY+xmRt2+wy518GVS AAZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=07MO+UKrJWJLtz9Ryi/mULaYddTIKmAHbZ6RqTNl+LM=; b=NoWQbj+obwhC2q22ubIgFI7NWq2WlRJpTZa2dPRr70O2rBuhp+6J+yQIftose81svH d1+RNzj5zVSsI3dst27lb/bhNLcNKEwMyAN5XoJBL+lOMxIjD1yHKpRaaKRBxba0ep73 eTTZ0z3EoDLk/hiXa9E/budl0fC1t1GGVzYqSgOUyAnJ9fOBWNSUYslH6GWAsINzsPs3 kHFXbSck0+m3+ARWrWHJkRmGZWPV5CIzIRebXFCYnVy3dmThtDzJjThkf/cJQJZQur2Z DspL9zj6CAkixRpeVT8JGCDrg5thD+6jFUAJ14jFGkcJHUwEgX0LUDws9sGGT2JNuwCr QRsg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r17si21191782iov.104.2021.08.09.07.38.05 for ; Mon, 09 Aug 2021 07:38:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235460AbhHIOiN (ORCPT ); Mon, 9 Aug 2021 10:38:13 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3611 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233984AbhHIOfB (ORCPT ); Mon, 9 Aug 2021 10:35:01 -0400 Received: from fraeml713-chm.china.huawei.com (unknown [172.18.147.201]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4Gjz9Y1Jzyz6C990; Mon, 9 Aug 2021 22:34:09 +0800 (CST) Received: from lhreml724-chm.china.huawei.com (10.201.108.75) by fraeml713-chm.china.huawei.com (10.206.15.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Mon, 9 Aug 2021 16:34:39 +0200 Received: from localhost.localdomain (10.69.192.58) by lhreml724-chm.china.huawei.com (10.201.108.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 9 Aug 2021 15:34:36 +0100 From: John Garry To: , , CC: , , , , , , John Garry Subject: [PATCH v2 05/11] blk-mq-sched: Rename blk_mq_sched_alloc_{tags -> map_and_request}() Date: Mon, 9 Aug 2021 22:29:32 +0800 Message-ID: <1628519378-211232-6-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1628519378-211232-1-git-send-email-john.garry@huawei.com> References: <1628519378-211232-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.58] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To lhreml724-chm.china.huawei.com (10.201.108.75) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org 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_request. Signed-off-by: John Garry --- block/blk-mq-sched.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.26.2 Reviewed-by: Ming Lei diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index 2231fb0d4c35..b4d7ad9a7a60 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_request(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_request(q, hctx, i); if (ret) - goto err_free_tags; + goto err_free_map_and_request; } 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_request; } ret = e->ops.init_sched(q, e); @@ -645,7 +645,7 @@ 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: +err_free_map_and_request: blk_mq_sched_free_requests(q); blk_mq_sched_tags_teardown(q); q->elevator = NULL;