aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-10-31 22:56:04 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-12-04 14:31:00 -0500
commit435d5f4bb2ccba3b791d9ef61d2590e30b8e806e (patch)
treed482ef15334a703bbe406dab021880ce3d320870 /net
parentcac7f2429872d3733dc3f9915857b1691da2eb2f (diff)
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')
-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);
386 386
387static __net_init int net_ns_net_init(struct net *net) 387static __net_init int net_ns_net_init(struct net *net)
388{ 388{
389 return proc_alloc_inum(&net->proc_inum); 389 return proc_alloc_inum(&net->ns.inum);
390} 390}
391 391
392static __net_exit void net_ns_net_exit(struct net *net) 392static __net_exit void net_ns_net_exit(struct net *net)
393{ 393{
394 proc_free_inum(net->proc_inum); 394 proc_free_inum(net->ns.inum);
395} 395}
396 396
397static struct pernet_operations __net_initdata net_ns_ops = { 397static struct pernet_operations __net_initdata net_ns_ops = {
@@ -664,7 +664,7 @@ static int netns_install(struct nsproxy *nsproxy, void *ns)
664static unsigned int netns_inum(void *ns) 664static unsigned int netns_inum(void *ns)
665{ 665{
666 struct net *net = ns; 666 struct net *net = ns;
667 return net->proc_inum; 667 return net->ns.inum;
668} 668}
669 669
670const struct proc_ns_operations netns_operations = { 670const struct proc_ns_operations netns_operations = {