Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2777527pxb; Mon, 19 Apr 2021 13:45:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyD3ks0z+Zxrd0PKOhasKovEQN1EyEFGKrSlbzqxMpIP5BirYqcR204HH6G9zoucdonSnXl X-Received: by 2002:a17:90b:2291:: with SMTP id kx17mr970323pjb.79.1618865108999; Mon, 19 Apr 2021 13:45:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618865108; cv=none; d=google.com; s=arc-20160816; b=AW1E+uHOpixbVBk3zeYI5ZAWZ0Fe2MqMxltVnmbGbOK69ERFr2u7Pei722ZcEO/ADc khUbFUzCNAdqTuEHReiOL5LwjPtJqOUFT9khcclU9EPtvslzN4KatzwljOjpaVzHO02Q /FyKBkMHbLvfR6LLKg01sbWoq/Fm87iO5TDGd+w2x8cGq6sATWZkA19/EgafmJTRvqgS ISdfD7X/Jlj35RiJI2Dm5Qd3ZH+Fnajm9ij7fQfqXcWewrCfQH86/VUDPkEi/vyx+QpO 7haBXmeQ76j+vy/ux9ro7gha8g7udt2090p/iJ5Sa4bkSzUizMd9SXRVxlCOGshv63Dr x+rA== 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:cc:to:from :subject; bh=CpW8WB/2CKCMWmrHNd8XOv43jGu8zs33FzUPHyPArxM=; b=Y6LoyAy0RLu5LxKZUYLDtr09J0MYROFkQAsvqbOEF6tWPt0MrSLyFAzMo87w9m/9l3 +Vn8PSeR9ptXpulq3X96LkK5PK9glIjcE2aRDy9DOTpW7MkiH1Ve71CSchFtcJMEj4U4 d6EHxEn1frh9VmhJCcVdDj/Gz+xnzlaWX/Lm9KhctCbJyu65UJN79Y3llECWUmd4Anuy kL4ZizfywWnty0Hkw5HxoRDiTAQCOAm9nPWKO2TgpEbWgC/Co4ZfWKwRzJeG4cDPWME4 IwrWBOCgmtEL6WMiW2omeB2XftEpkzB4Hs1BN68uo/k1T/GCrvmUDG2ZKcnib/KKXtWx Fg8Q== 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 v15si17515757ply.134.2021.04.19.13.44.55; Mon, 19 Apr 2021 13:45:08 -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 S240547AbhDSSDc (ORCPT + 99 others); Mon, 19 Apr 2021 14:03:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:41192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240553AbhDSSDb (ORCPT ); Mon, 19 Apr 2021 14:03:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 19C0861107; Mon, 19 Apr 2021 18:03:01 +0000 (UTC) Subject: [PATCH v3 13/26] xprtrdma: Rename frwr_release_mr() From: Chuck Lever To: trondmy@hammerspace.com Cc: linux-nfs@vger.kernel.org, linux-rdma@vger.kernel.org Date: Mon, 19 Apr 2021 14:03:00 -0400 Message-ID: <161885538028.38598.6546480161907588794.stgit@manet.1015granger.net> In-Reply-To: <161885481568.38598.16682844600209775665.stgit@manet.1015granger.net> References: <161885481568.38598.16682844600209775665.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,