[6.1.y,04/18] NFSD: Rename nfsd_reply_cache_alloc()

Message ID	20240810200009.9882-5-cel@kernel.org
State	Not Applicable
Headers	show Return-Path: <ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it> From: cel@kernel.org To: <stable@vger.kernel.org> Date: Sat, 10 Aug 2024 15:59:55 -0400 Message-ID: <20240810200009.9882-5-cel@kernel.org> In-Reply-To: <20240810200009.9882-1-cel@kernel.org> References: <20240810200009.9882-1-cel@kernel.org> MIME-Version: 1.0 Subject: [LTP] [PATCH 6.1.y 04/18] NFSD: Rename nfsd_reply_cache_alloc() Precedence: list Cc: linux-nfs@vger.kernel.org, Jeff Layton <jlayton@kernel.org>, sherry.yang@oracle.com, Chuck Lever <chuck.lever@oracle.com>, calum.mackay@oracle.com, kernel-team@fb.com, ltp@lists.linux.it Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" <ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it>
Series	Backport "make svc_stat per-net instead of global" \| expand [6.1.y,00/18] Backport "make svc_stat per-net instead of global" [6.1.y,01/18] nfsd: move reply cache initialization into nfsd startup [6.1.y,02/18] nfsd: move init of percpu reply_cache_stats counters back to nfsd_init_net [6.1.y,03/18] NFSD: Refactor nfsd_reply_cache_free_locked() [6.1.y,04/18] NFSD: Rename nfsd_reply_cache_alloc() [6.1.y,05/18] NFSD: Replace nfsd_prune_bucket() [6.1.y,06/18] NFSD: Refactor the duplicate reply cache shrinker [6.1.y,07/18] NFSD: Rewrite synopsis of nfsd_percpu_counters_init() [6.1.y,08/18] NFSD: Fix frame size warning in svc_export_parse() [6.1.y,09/18] sunrpc: don't change ->sv_stats if it doesn't exist [6.1.y,10/18] nfsd: stop setting ->pg_stats for unused stats [6.1.y,11/18] sunrpc: pass in the sv_stats struct through svc_create_pooled [6.1.y,12/18] sunrpc: remove ->pg_stats from svc_program [6.1.y,13/18] sunrpc: use the struct net as the svc proc private [6.1.y,14/18] nfsd: rename NFSD_NET_* to NFSD_STATS_* [6.1.y,15/18] nfsd: expose /proc/net/sunrpc/nfsd in net namespaces [6.1.y,16/18] nfsd: make all of the nfsd stats per-network namespace [6.1.y,17/18] nfsd: remove nfsd_stats, make th_cnt a global counter [6.1.y,18/18] nfsd: make svc_stat per-network namespace instead of global

Message ID

20240810200009.9882-5-cel@kernel.org

State

Not Applicable

Headers

From: cel@kernel.org
To: <stable@vger.kernel.org>
Date: Sat, 10 Aug 2024 15:59:55 -0400
Message-ID: <20240810200009.9882-5-cel@kernel.org>
In-Reply-To: <20240810200009.9882-1-cel@kernel.org>
References: <20240810200009.9882-1-cel@kernel.org>
MIME-Version: 1.0
Subject: [LTP] [PATCH 6.1.y 04/18] NFSD: Rename nfsd_reply_cache_alloc()
Precedence: list
Cc: linux-nfs@vger.kernel.org, Jeff Layton <jlayton@kernel.org>,
 sherry.yang@oracle.com, Chuck Lever <chuck.lever@oracle.com>,
 calum.mackay@oracle.com, kernel-team@fb.com, ltp@lists.linux.it
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it
Sender: "ltp" <ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it>

Series

Backport "make svc_stat per-net instead of global" | expand

Commit Message

Chuck Lever Aug. 10, 2024, 7:59 p.m. UTC

From: Chuck Lever <chuck.lever@oracle.com>

[ Upstream commit ff0d169329768c1102b7b07eebe5a9839aa1c143 ]

For readability, rename to match the other helpers.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Stable-dep-of: 4b14885411f7 ("nfsd: make all of the nfsd stats per-network namespace")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 fs/nfsd/nfscache.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
index 11d00b2853ff..16e62e92964a 100644
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
@@ -85,8 +85,8 @@  nfsd_hashsize(unsigned int limit)
 }
 
 static struct svc_cacherep *
-nfsd_reply_cache_alloc(struct svc_rqst *rqstp, __wsum csum,
-			struct nfsd_net *nn)
+nfsd_cacherep_alloc(struct svc_rqst *rqstp, __wsum csum,
+		    struct nfsd_net *nn)
 {
 	struct svc_cacherep	*rp;
 
@@ -481,7 +481,7 @@  int nfsd_cache_lookup(struct svc_rqst *rqstp, unsigned int start,
 	 * preallocate an entry.
 	 */
 	nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
-	rp = nfsd_reply_cache_alloc(rqstp, csum, nn);
+	rp = nfsd_cacherep_alloc(rqstp, csum, nn);
 	if (!rp)
 		goto out;

[6.1.y,04/18] NFSD: Rename nfsd_reply_cache_alloc()

Commit Message

Patch