From: "J. Bruce Fields" <bfields@fieldses.org>
To: Stanislav Kinsbursky <skinsbursky@parallels.com>
Cc: Trond.Myklebust@netapp.com, linux-nfs@vger.kernel.org,
xemul@parallels.com, neilb@suse.de, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, jbottomley@parallels.com,
davem@davemloft.net, devel@openvz.org
Subject: Re: [PATCH 2/2] SUNRPC: register service stats /proc entries in passed network namespace context
Date: Tue, 6 Dec 2011 16:49:28 -0500 [thread overview]
Message-ID: <20111206214928.GF12640@fieldses.org> (raw)
In-Reply-To: <20111206124249.15702.211.stgit@localhost6.localdomain6>
On Tue, Dec 06, 2011 at 04:42:49PM +0300, Stanislav Kinsbursky wrote:
> This patch makes it possible to create NFSd program entry ("/proc/net/rpc/nfsd")
> in passed network namespace context instead of hard-coded "init_net".
Acked-by: J. Bruce Fields <bfields@redhat.com>
Or I can just apply it. I'll assume it's going through Trond's tree
unless I hear otherwise.
--b.
>
> Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
>
> ---
> fs/nfsd/stats.c | 5 +++--
> include/linux/sunrpc/stats.h | 8 ++++----
> net/sunrpc/stats.c | 8 ++++----
> 3 files changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/fs/nfsd/stats.c b/fs/nfsd/stats.c
> index a2e2402..6d4521f 100644
> --- a/fs/nfsd/stats.c
> +++ b/fs/nfsd/stats.c
> @@ -25,6 +25,7 @@
> #include <linux/module.h>
> #include <linux/sunrpc/stats.h>
> #include <linux/nfsd/stats.h>
> +#include <net/net_namespace.h>
>
> #include "nfsd.h"
>
> @@ -94,11 +95,11 @@ static const struct file_operations nfsd_proc_fops = {
> void
> nfsd_stat_init(void)
> {
> - svc_proc_register(&nfsd_svcstats, &nfsd_proc_fops);
> + svc_proc_register(&init_net, &nfsd_svcstats, &nfsd_proc_fops);
> }
>
> void
> nfsd_stat_shutdown(void)
> {
> - svc_proc_unregister("nfsd");
> + svc_proc_unregister(&init_net, "nfsd");
> }
> diff --git a/include/linux/sunrpc/stats.h b/include/linux/sunrpc/stats.h
> index f625b57..4720b12 100644
> --- a/include/linux/sunrpc/stats.h
> +++ b/include/linux/sunrpc/stats.h
> @@ -61,9 +61,9 @@ void rpc_modcount(struct inode *, int);
> struct proc_dir_entry * rpc_proc_register(struct net *,struct rpc_stat *);
> void rpc_proc_unregister(struct net *,const char *);
> void rpc_proc_zero(struct rpc_program *);
> -struct proc_dir_entry * svc_proc_register(struct svc_stat *,
> +struct proc_dir_entry * svc_proc_register(struct net *, struct svc_stat *,
> const struct file_operations *);
> -void svc_proc_unregister(const char *);
> +void svc_proc_unregister(struct net *, const char *);
>
> void svc_seq_show(struct seq_file *,
> const struct svc_stat *);
> @@ -73,9 +73,9 @@ static inline struct proc_dir_entry *rpc_proc_register(struct net *, struct rpc_
> static inline void rpc_proc_unregisterstruct net *, (const char *p) {}
> static inline void rpc_proc_zero(struct rpc_program *p) {}
>
> -static inline struct proc_dir_entry *svc_proc_register(struct svc_stat *s,
> +static inline struct proc_dir_entry *svc_proc_register(struct net *net, struct svc_stat *s,
> const struct file_operations *f) { return NULL; }
> -static inline void svc_proc_unregister(const char *p) {}
> +static inline void svc_proc_unregister(struct net *net, const char *p) {}
>
> static inline void svc_seq_show(struct seq_file *seq,
> const struct svc_stat *st) {}
> diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
> index f0f6e7c..3c4f688 100644
> --- a/net/sunrpc/stats.c
> +++ b/net/sunrpc/stats.c
> @@ -241,18 +241,18 @@ rpc_proc_unregister(struct net *net, const char *name)
> EXPORT_SYMBOL_GPL(rpc_proc_unregister);
>
> struct proc_dir_entry *
> -svc_proc_register(struct svc_stat *statp, const struct file_operations *fops)
> +svc_proc_register(struct net *net, struct svc_stat *statp, const struct file_operations *fops)
> {
> - return do_register(&init_net, statp->program->pg_name, statp, fops);
> + return do_register(net, statp->program->pg_name, statp, fops);
> }
> EXPORT_SYMBOL_GPL(svc_proc_register);
>
> void
> -svc_proc_unregister(const char *name)
> +svc_proc_unregister(struct net *net, const char *name)
> {
> struct sunrpc_net *sn;
>
> - sn = net_generic(&init_net, sunrpc_net_id);
> + sn = net_generic(net, sunrpc_net_id);
> remove_proc_entry(name, sn->proc_net_rpc);
> }
> EXPORT_SYMBOL_GPL(svc_proc_unregister);
>
next prev parent reply other threads:[~2011-12-06 21:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-06 13:42 [PATCH 0/2] SUNRPC: make /proc helpers network-namespace-aware Stanislav Kinsbursky
2011-12-06 13:42 ` [PATCH 1/2] SUNRPC: register RPC stats /proc entries in passed network namespace context Stanislav Kinsbursky
2011-12-06 21:33 ` J. Bruce Fields
2012-01-30 18:29 ` Paul Gortmaker
2012-01-30 20:49 ` Myklebust, Trond
2011-12-06 13:42 ` [PATCH 2/2] SUNRPC: register service " Stanislav Kinsbursky
2011-12-06 21:49 ` J. Bruce Fields [this message]
2012-01-20 11:34 ` [PATCH 0/2] SUNRPC: make /proc helpers network-namespace-aware Stanislav Kinsbursky
2012-01-20 14:30 ` bfields
2012-01-20 14:39 ` Trond Myklebust
2012-01-20 16:16 ` Stanislav Kinsbursky
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=20111206214928.GF12640@fieldses.org \
--to=bfields@fieldses.org \
--cc=Trond.Myklebust@netapp.com \
--cc=davem@davemloft.net \
--cc=devel@openvz.org \
--cc=jbottomley@parallels.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=neilb@suse.de \
--cc=netdev@vger.kernel.org \
--cc=skinsbursky@parallels.com \
--cc=xemul@parallels.com \
/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).