Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3706601pxf; Mon, 5 Apr 2021 20:51:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFNe0SxaQ83nQoUXH+tRz7ztk7ILoTjYzWBObnUZMBHOD/vAYRuwSWGxKZ1tztyTt3oF9k X-Received: by 2002:a92:6011:: with SMTP id u17mr1642877ilb.274.1617681060736; Mon, 05 Apr 2021 20:51:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617681060; cv=none; d=google.com; s=arc-20160816; b=nBmjmFlKphSDy2mT+Hww83sR0sHC19vG0+i6j0//TOLQWxrYTraLIfF3mNpY2M/qKM R+utXeVWo8v94Bk3cE3qllkPo1+mdGBY5c3fTPcWjl0pumhI+O6NPtCVlIq45g0IpSam 2PPh8I09MmmnMZKFbyayKoVMixd9MFrFiVON4D6JhCJHyLKsGpnn/C3W/0W13YfurC0D 2NMbfpf/PnyNjxT+bOjN+i/Nb13izQ1pnTCYJ3UDiB6A4te7czkpoISVajMnSrPW0tDl VzjUQaSved8Ub63fyIUwJna1cEoiWpsKCiVUYh8cEn1RoOZ6rT1aqtbkP2+kjcEOUEaU o2Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:to:from:subject; bh=CpW8WB/2CKCMWmrHNd8XOv43jGu8zs33FzUPHyPArxM=; b=A4+ZvHUMeE8e68blPEirCtmaiwPXscJ3Xyt6PVAxkvLPOGynPQNwxV531aUqgifGb4 IClcv0/nG8JGXYXSREM3RuXxZ+29BYTsLqUXxkZDvTja2gd3ruR3cBPcqHzvcSLgZkSx RBvGQvwEvrKWoaRzhJno3FAC2coGp7rTYfL/zh9Ot6ZIE+efwdTI0iQkTS04pa9jPAq4 l0qIGtMXY3RgDhh8W+ZgxvV2P6w0ytiMozp9nuNIymXCi7TWOjVRo06hdOrIxancUOnB j4AxBMkwSbYWA6QfEvaTklU8SWmRi7xUeAnyRlv13n08xGZDFBrSbSNmUT8Xh6sH8vub mlGg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w17si17029213jai.126.2021.04.05.20.50.47; Mon, 05 Apr 2021 20:51:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-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-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242436AbhDEQfH (ORCPT + 99 others); Mon, 5 Apr 2021 12:35:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:40772 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242438AbhDEQfG (ORCPT ); Mon, 5 Apr 2021 12:35:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5051561398; Mon, 5 Apr 2021 16:35:00 +0000 (UTC) Subject: [PATCH v1 2/6] xprtrdma: Rename frwr_release_mr() From: Chuck Lever To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Mon, 05 Apr 2021 12:34:59 -0400 Message-ID: <161764049955.29855.18002367097626979576.stgit@manet.1015granger.net> In-Reply-To: <161764034907.29855.614994107807503843.stgit@manet.1015granger.net> References: <161764034907.29855.614994107807503843.stgit@manet.1015granger.net> User-Agent: StGit/0.23-29-ga622f1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Clean up: To be consistent with other functions in this source file, follow the naming convention of putting the object being acted upon before the action itself. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/frwr_ops.c | 6 +++--- net/sunrpc/xprtrdma/verbs.c | 4 ++-- net/sunrpc/xprtrdma/xprt_rdma.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c index aca2228095db..bfc057fdb75f 100644 --- a/net/sunrpc/xprtrdma/frwr_ops.c +++ b/net/sunrpc/xprtrdma/frwr_ops.c @@ -50,11 +50,11 @@ #endif /** - * frwr_release_mr - Destroy one MR + * frwr_mr_release - Destroy one MR * @mr: MR allocated by frwr_mr_init * */ -void frwr_release_mr(struct rpcrdma_mr *mr) +void frwr_mr_release(struct rpcrdma_mr *mr) { int rc; @@ -88,7 +88,7 @@ static void frwr_mr_recycle(struct rpcrdma_mr *mr) r_xprt->rx_stats.mrs_recycled++; spin_unlock(&r_xprt->rx_buf.rb_lock); - frwr_release_mr(mr); + frwr_mr_release(mr); } static void frwr_mr_put(struct rpcrdma_mr *mr) diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 098d5c550e9b..d4e573eef416 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -1138,7 +1138,7 @@ void rpcrdma_req_destroy(struct rpcrdma_req *req) list_del(&mr->mr_all); spin_unlock(&buf->rb_lock); - frwr_release_mr(mr); + frwr_mr_release(mr); } rpcrdma_regbuf_free(req->rl_recvbuf); @@ -1169,7 +1169,7 @@ static void rpcrdma_mrs_destroy(struct rpcrdma_xprt *r_xprt) list_del(&mr->mr_all); spin_unlock(&buf->rb_lock); - frwr_release_mr(mr); + frwr_mr_release(mr); spin_lock(&buf->rb_lock); } diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h index 9c5039d4634a..1b187d1dee8a 100644 --- a/net/sunrpc/xprtrdma/xprt_rdma.h +++ b/net/sunrpc/xprtrdma/xprt_rdma.h @@ -528,7 +528,7 @@ rpcrdma_data_dir(bool writing) void frwr_reset(struct rpcrdma_req *req); int frwr_query_device(struct rpcrdma_ep *ep, const struct ib_device *device); int frwr_mr_init(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr *mr); -void frwr_release_mr(struct rpcrdma_mr *mr); +void frwr_mr_release(struct rpcrdma_mr *mr); struct rpcrdma_mr_seg *frwr_map(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr_seg *seg, int nsegs, bool writing, __be32 xid,