summaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-11-01 05:56:04 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2014-12-04 22:31:00 +0300
commit435d5f4bb2ccba3b791d9ef61d2590e30b8e806e (patch)
treed482ef15334a703bbe406dab021880ce3d320870 /net/core
parentcac7f2429872d3733dc3f9915857b1691da2eb2f (diff)
downloadlinux-435d5f4bb2ccba3b791d9ef61d2590e30b8e806e.tar.xz
common object embedded into various struct ....ns
for now - just move corresponding ->proc_inum instances over there Acked-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/net_namespace.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 7f155175bba8..f2f756ce99d7 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -386,12 +386,12 @@ EXPORT_SYMBOL_GPL(get_net_ns_by_pid);
static __net_init int net_ns_net_init(struct net *net)
{
- return proc_alloc_inum(&net->proc_inum);
+ return proc_alloc_inum(&net->ns.inum);
}
static __net_exit void net_ns_net_exit(struct net *net)
{
- proc_free_inum(net->proc_inum);
+ proc_free_inum(net->ns.inum);
}
static struct pernet_operations __net_initdata net_ns_ops = {
@@ -664,7 +664,7 @@ static int netns_install(struct nsproxy *nsproxy, void *ns)
static unsigned int netns_inum(void *ns)
{
struct net *net = ns;
- return net->proc_inum;
+ return net->ns.inum;
}
const struct proc_ns_operations netns_operations = {