From: Josef Bacik <josef@xxxxxxxxxxxxxx>
[ 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@xxxxxxxxxxxxxx>
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/sunrpc/stats.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@ -309,7 +309,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);
Patches currently in stable-queue which might be from cel@xxxxxxxxxx are
queue-5.10/nfsd-rename-nfsd_net_-to-nfsd_stats_.patch
queue-5.10/nfsd-rename-nfsd_reply_cache_alloc.patch
queue-5.10/nfsd-simplify-error-paths-in-nfsd_svc.patch
queue-5.10/sunrpc-pass-in-the-sv_stats-struct-through-svc_create_pooled.patch
queue-5.10/nfsd-move-init-of-percpu-reply_cache_stats-counters-back-to-nfsd_init_net.patch
queue-5.10/sunrpc-use-the-struct-net-as-the-svc-proc-private.patch
queue-5.10/nfsd-rewrite-synopsis-of-nfsd_percpu_counters_init.patch
queue-5.10/nfsd-replace-nfsd_prune_bucket.patch
queue-5.10/nfsd-refactor-the-duplicate-reply-cache-shrinker.patch
queue-5.10/sunrpc-remove-pg_stats-from-svc_program.patch
queue-5.10/nfsd-make-all-of-the-nfsd-stats-per-network-namespace.patch
queue-5.10/nfsd-fix-frame-size-warning-in-svc_export_parse.patch
queue-5.10/nfsd-expose-proc-net-sunrpc-nfsd-in-net-namespaces.patch
queue-5.10/nfsd-move-reply-cache-initialization-into-nfsd-startup.patch
queue-5.10/nfsd-remove-nfsd_stats-make-th_cnt-a-global-counter.patch
queue-5.10/nfsd-make-svc_stat-per-network-namespace-instead-of-global.patch
queue-5.10/sunrpc-don-t-change-sv_stats-if-it-doesn-t-exist.patch
queue-5.10/nfsd-refactor-nfsd_reply_cache_free_locked.patch
queue-5.10/nfsd-stop-setting-pg_stats-for-unused-stats.patch
