From patchwork Wed Nov 27 20:18:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1201794 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47NXCz6zD6z9sR8; Thu, 28 Nov 2019 07:18:55 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ia3lx-00039G-MN; Wed, 27 Nov 2019 20:18:49 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ia3lt-00036c-Ob for kernel-team@lists.ubuntu.com; Wed, 27 Nov 2019 20:18:45 +0000 Received: from mail-qt1-f198.google.com ([209.85.160.198]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ia3lt-0004Tr-Fo for kernel-team@lists.ubuntu.com; Wed, 27 Nov 2019 20:18:45 +0000 Received: by mail-qt1-f198.google.com with SMTP id e37so1167548qtk.7 for ; Wed, 27 Nov 2019 12:18:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bPlezNudUp4i514SlB0nN/TTczJAiHDMf1dDJpBD3qA=; b=QBEQGXZ5rpzxtw+mq7oBTjPt23ddNmMyE265XsL8dPWYGl3tTUYB5MsSwgg3oORry4 srwIBKbrbPjfM1SW/XKW0jAj14CLp5ZidR4MBycpX7nHunGeXbQR8MpVCj6p2v4/ryBs /nJOb69Mn+TG6zVrhuoa4o/PM1rDbgL0lk/yglcrjxLkcF2bTAzNQCHqrH60N3jM92Iv EDyTqkCDrSsp06r71FW+F6ARawpd7CI+lv8FFBrMWkfzmW8hthxW4xXFjXop5FpZ3isp 0oN4BfljZmxIAiimp62QBmirv1MTa7orOtJinRSNKtgOQWDrNFLiQ1qIDdClktEI9jwI kJ6g== X-Gm-Message-State: APjAAAVDZnmqBhBX09bx/7zKKFYGTl7N3gUlyc2NdboQ/rd0M33iQEpa cJMCgtaTxaH3RcjXLXv21pPEo64VyHklbzrU6Kkpc5jbfoeBuJpKw5X93/uBl+m+1bj480Lepxp Q/ElBydXsky4PvwnOT5El/Bm3PHkN4NzF30VDbYe6 X-Received: by 2002:ad4:52c8:: with SMTP id p8mr7274376qvs.84.1574885924204; Wed, 27 Nov 2019 12:18:44 -0800 (PST) X-Google-Smtp-Source: APXvYqxINfjrC2xyA8IsCJ9H5deaql5eVFJ4QxlK4evPklkdPEsUlTZ7dyaQejrhEnIxcS4zBAfg6g== X-Received: by 2002:ad4:52c8:: with SMTP id p8mr7274337qvs.84.1574885923819; Wed, 27 Nov 2019 12:18:43 -0800 (PST) Received: from gallifrey.lan ([2804:14c:4e6:1bc:4960:b0eb:4714:41f]) by smtp.gmail.com with ESMTPSA id o13sm8284524qto.96.2019.11.27.12.18.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 12:18:43 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [xenial:linux-azure][PATCH 09/15] blk-mq: Rename blk_mq_request_direct_issue() into blk_mq_request_issue_directly() Date: Wed, 27 Nov 2019 17:18:14 -0300 Message-Id: <20191127201820.32174-10-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191127201820.32174-1-marcelo.cerri@canonical.com> References: <20191127201820.32174-1-marcelo.cerri@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Bart Van Assche BugLink: https://bugs.launchpad.net/bugs/1848739 Most blk-mq functions have a name that follows the pattern blk_mq_${action}. However, the function name blk_mq_request_direct_issue is an exception. Hence rename this function. This patch does not change any functionality. Reviewed-by: Mike Snitzer Signed-off-by: Bart Van Assche Signed-off-by: Jens Axboe (cherry picked from commit c77ff7fd03ddca8face268c4cf093c0edf4bcf1f) Signed-off-by: Marcelo Henrique Cerri --- block/blk-core.c | 2 +- block/blk-mq.c | 4 ++-- block/blk-mq.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 30a3cb2eca5a..f885b65324c2 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2508,7 +2508,7 @@ blk_status_t blk_insert_cloned_request(struct request_queue *q, struct request * * bypass a potential scheduler on the bottom device for * insert. */ - return blk_mq_request_direct_issue(rq); + return blk_mq_request_issue_directly(rq); } spin_lock_irqsave(q->queue_lock, flags); diff --git a/block/blk-mq.c b/block/blk-mq.c index e035215b1546..3145221ca824 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1751,7 +1751,7 @@ static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx, * RCU or SRCU read lock is needed before checking quiesced flag. * * When queue is stopped or quiesced, ignore 'bypass_insert' from - * blk_mq_request_direct_issue(), and return BLK_STS_OK to caller, + * blk_mq_request_issue_directly(), and return BLK_STS_OK to caller, * and avoid driver to try to dispatch again. */ if (blk_mq_hctx_stopped(hctx) || blk_queue_quiesced(q)) { @@ -1799,7 +1799,7 @@ static void blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx, hctx_unlock(hctx, srcu_idx); } -blk_status_t blk_mq_request_direct_issue(struct request *rq) +blk_status_t blk_mq_request_issue_directly(struct request *rq) { blk_status_t ret; int srcu_idx; diff --git a/block/blk-mq.h b/block/blk-mq.h index 0daa9f2c3d61..c11c627ebd6d 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -61,7 +61,7 @@ void blk_mq_insert_requests(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx, struct list_head *list); /* Used by blk_insert_cloned_request() to issue request directly */ -blk_status_t blk_mq_request_direct_issue(struct request *rq); +blk_status_t blk_mq_request_issue_directly(struct request *rq); /* * CPU -> queue mappings