From patchwork Mon Sep 13 15:12:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 509782 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp655423jao; Mon, 13 Sep 2021 08:18:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNX7js1YJ/K5Qzh7D3cgO9HbhhCi0Iz6oLCq19+8MRx5GEkt/B7kHQLi6nTB6IBujdaC1f X-Received: by 2002:a17:907:9908:: with SMTP id ka8mr13699078ejc.164.1631546303081; Mon, 13 Sep 2021 08:18:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631546303; cv=none; d=google.com; s=arc-20160816; b=Yt2xsK2rVLqc7GMRnKCeDFAEDjbwoPUy9xsM+1OYHjPdmSh/wU3XFdie7VCZa6jTmZ Hc1AYtB+ol6WTvarmI7XoiuUwyNZHRW4GOKBmQ5Mih/Gd4cZDyqHzxxLezgxqLG8Q1B2 i3FUV4oRHQI9EHfhhlTakv13uFZhoo33a5CazqwqipG3hD29g3gap0wA0PRNgXthW8SS hRC5p596Yrumb1eo7FiIrKcVTtA7QkHD5csfjSDnUc8qSxQ0bD3q/+HowcUhiya25oRC UlYD7z9QXp9IR30djjrfC+/M9F4gWREYqJSYM1dRINFwUpQaSsGW0WawJ6+vRs4moewN W8Rw== 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=SaJDUbzOVR887+TW0Z1MzFGHen8bQ48g9SwkAjwQlOI=; b=IJEeIu7in25lhtvdfkf/qOt5JHEn51wxLGf+77cH8ARl7SG0xy4M/KwIGwMAd0454z xoEuwltWdICtpR4fZBp+t1mRyht3fe2D6AzVsoSBNZ4ttQm5qYk9yFiB4Cn8ucK1tzFd TYuF2tsuymJfxxBmlSqp6AJ/NU860rmrqqdAEkrpl/+j+xGAT49+kCKD/5ToBn+ubNNE Ke5y9oqkK2t83S6WsLX/b5HpCH4l0R47FDtejaVhPNVfW5dqStBE//TdemPavvp8BF1J enumXhBgzW4kXhSiHzqvYX4Hj8+8dLnNHwTD1IvQgMTvAn8qu3Mi09bUMaBjUeyVGQ0t Oc5w== 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 18si7608876ejh.282.2021.09.13.08.18.22 for ; Mon, 13 Sep 2021 08:18:23 -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 S231202AbhIMPT1 (ORCPT ); Mon, 13 Sep 2021 11:19:27 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3778 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346154AbhIMPSv (ORCPT ); Mon, 13 Sep 2021 11:18:51 -0400 Received: from fraeml740-chm.china.huawei.com (unknown [172.18.147.201]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4H7VQp68wlz6H6qJ; Mon, 13 Sep 2021 23:15:14 +0800 (CST) Received: from lhreml724-chm.china.huawei.com (10.201.108.75) by fraeml740-chm.china.huawei.com (10.206.15.221) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Mon, 13 Sep 2021 17:17:33 +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.2308.8; Mon, 13 Sep 2021 16:17:31 +0100 From: John Garry To: CC: , , , , John Garry Subject: [PATCH RESEND v3 06/13] blk-mq-sched: Rename blk_mq_sched_free_{requests -> rqs}() Date: Mon, 13 Sep 2021 23:12:23 +0800 Message-ID: <1631545950-56586-7-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1631545950-56586-1-git-send-email-john.garry@huawei.com> References: <1631545950-56586-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.58] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) 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 To be more concise and consistent in naming, rename blk_mq_sched_free_requests() -> blk_mq_sched_free_rqs(). Signed-off-by: John Garry --- block/blk-core.c | 2 +- block/blk-mq-sched.c | 6 +++--- block/blk-mq-sched.h | 2 +- block/blk.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) -- 2.26.2 Reviewed-by: Hannes Reinecke diff --git a/block/blk-core.c b/block/blk-core.c index 5d7137bec48e..3480df0e958c 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -406,7 +406,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); diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index 5f340203e6e5..3ab26154f0ea 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -631,7 +631,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) err_free_sbitmap: if (blk_mq_is_sbitmap_shared(q->tag_set->flags)) blk_mq_exit_sched_shared_sbitmap(q); - blk_mq_sched_free_requests(q); + blk_mq_sched_free_rqs(q); err_free_map_and_rqs: blk_mq_sched_tags_teardown(q); q->elevator = NULL; @@ -656,7 +656,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; diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h index 1e46be6c5178..e70748d18754 100644 --- a/block/blk-mq-sched.h +++ b/block/blk-mq-sched.h @@ -28,7 +28,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, diff --git a/block/blk.h b/block/blk.h index 7d2a0ba7ed21..6f125c8cddb0 100644 --- a/block/blk.h +++ b/block/blk.h @@ -200,7 +200,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); }