From: cel@kernel.org
To: <stable@vger.kernel.org>
Cc: <linux-nfs@vger.kernel.org>,
pvorel@suse.cz, sherry.yang@oracle.com, calum.mackay@oracle.com,
kernel-team@fb.com, Josef Bacik <josef@toxicpanda.com>,
Jeff Layton <jlayton@kernel.org>
Subject: [PATCH 6.6.y 07/12] sunrpc: use the struct net as the svc proc private
Date: Mon, 12 Aug 2024 18:35:59 -0400 [thread overview]
Message-ID: <20240812223604.32592-8-cel@kernel.org> (raw)
In-Reply-To: <20240812223604.32592-1-cel@kernel.org>
From: Josef Bacik <josef@toxicpanda.com>
[ Upstream commit 418b9687dece5bd763c09b5c27a801a7e3387be9 ]
nfsd is the only thing using this helper, and it doesn't use the private
currently. When we switch to per-network namespace stats we will need
the struct net * in order to get to the nfsd_net. Use the net as the
proc private so we can utilize this when we make the switch over.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
net/sunrpc/stats.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
index 65fc1297c6df..383860cb1d5b 100644
--- a/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@ -314,7 +314,7 @@ EXPORT_SYMBOL_GPL(rpc_proc_unregister);
struct proc_dir_entry *
svc_proc_register(struct net *net, struct svc_stat *statp, const struct proc_ops *proc_ops)
{
- return do_register(net, statp->program->pg_name, statp, proc_ops);
+ return do_register(net, statp->program->pg_name, net, proc_ops);
}
EXPORT_SYMBOL_GPL(svc_proc_register);
--
2.45.1
next prev parent reply other threads:[~2024-08-12 22:37 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-12 22:35 [PATCH 6.6.y 00/12] Backport "make svc_stat per-net instead of global" cel
2024-08-12 22:35 ` [PATCH 6.6.y 01/12] NFSD: Rewrite synopsis of nfsd_percpu_counters_init() cel
2024-08-12 22:35 ` [PATCH 6.6.y 02/12] NFSD: Fix frame size warning in svc_export_parse() cel
2024-08-12 22:35 ` [PATCH 6.6.y 03/12] sunrpc: don't change ->sv_stats if it doesn't exist cel
2024-08-12 22:35 ` [PATCH 6.6.y 04/12] nfsd: stop setting ->pg_stats for unused stats cel
2024-08-12 22:35 ` [PATCH 6.6.y 05/12] sunrpc: pass in the sv_stats struct through svc_create_pooled cel
2024-08-12 22:35 ` [PATCH 6.6.y 06/12] sunrpc: remove ->pg_stats from svc_program cel
2024-08-12 22:35 ` cel [this message]
2024-08-12 22:36 ` [PATCH 6.6.y 08/12] nfsd: rename NFSD_NET_* to NFSD_STATS_* cel
2024-08-12 22:36 ` [PATCH 6.6.y 09/12] nfsd: expose /proc/net/sunrpc/nfsd in net namespaces cel
2024-08-12 22:36 ` [PATCH 6.6.y 10/12] nfsd: make all of the nfsd stats per-network namespace cel
2024-08-12 22:36 ` [PATCH 6.6.y 11/12] nfsd: remove nfsd_stats, make th_cnt a global counter cel
2024-08-12 22:36 ` [PATCH 6.6.y 12/12] nfsd: make svc_stat per-network namespace instead of global cel
2024-08-14 7:45 ` [PATCH 6.6.y 00/12] Backport "make svc_stat per-net instead of global" Petr Vorel
[not found] ` <BN0PR10MB5143EDD71EF92A181D4255A0E7872@BN0PR10MB5143.namprd10.prod.outlook.com>
2024-08-14 10:09 ` Petr Vorel
2024-08-14 12:13 ` Calum Mackay
2024-08-14 12:10 ` Calum Mackay
2024-08-14 12:14 ` Calum Mackay
2024-08-15 8:25 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240812223604.32592-8-cel@kernel.org \
--to=cel@kernel.org \
--cc=calum.mackay@oracle.com \
--cc=jlayton@kernel.org \
--cc=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-nfs@vger.kernel.org \
--cc=pvorel@suse.cz \
--cc=sherry.yang@oracle.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).