iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

common object embedded into various struct ....ns

Browse Source 
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>
This commit is contained in:
Al Viro
2014-10-31 22:56:04 -04:00
parent cac7f24298
commit 435d5f4bb2
17 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/core/net_namespace.c
View File

@ -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 = {