diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-31 22:56:04 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-04 14:31:00 -0500 |
commit | 435d5f4bb2ccba3b791d9ef61d2590e30b8e806e (patch) | |
tree | d482ef15334a703bbe406dab021880ce3d320870 /kernel/pid_namespace.c | |
parent | cac7f2429872d3733dc3f9915857b1691da2eb2f (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 'kernel/pid_namespace.c')
-rw-r--r-- | kernel/pid_namespace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c index db95d8eb761b..99e27e5bf906 100644 --- a/kernel/pid_namespace.c +++ b/kernel/pid_namespace.c | |||
@@ -105,7 +105,7 @@ static struct pid_namespace *create_pid_namespace(struct user_namespace *user_ns | |||
105 | if (ns->pid_cachep == NULL) | 105 | if (ns->pid_cachep == NULL) |
106 | goto out_free_map; | 106 | goto out_free_map; |
107 | 107 | ||
108 | err = proc_alloc_inum(&ns->proc_inum); | 108 | err = proc_alloc_inum(&ns->ns.inum); |
109 | if (err) | 109 | if (err) |
110 | goto out_free_map; | 110 | goto out_free_map; |
111 | 111 | ||
@@ -142,7 +142,7 @@ static void destroy_pid_namespace(struct pid_namespace *ns) | |||
142 | { | 142 | { |
143 | int i; | 143 | int i; |
144 | 144 | ||
145 | proc_free_inum(ns->proc_inum); | 145 | proc_free_inum(ns->ns.inum); |
146 | for (i = 0; i < PIDMAP_ENTRIES; i++) | 146 | for (i = 0; i < PIDMAP_ENTRIES; i++) |
147 | kfree(ns->pidmap[i].page); | 147 | kfree(ns->pidmap[i].page); |
148 | put_user_ns(ns->user_ns); | 148 | put_user_ns(ns->user_ns); |
@@ -365,7 +365,7 @@ static int pidns_install(struct nsproxy *nsproxy, void *ns) | |||
365 | static unsigned int pidns_inum(void *ns) | 365 | static unsigned int pidns_inum(void *ns) |
366 | { | 366 | { |
367 | struct pid_namespace *pid_ns = ns; | 367 | struct pid_namespace *pid_ns = ns; |
368 | return pid_ns->proc_inum; | 368 | return pid_ns->ns.inum; |
369 | } | 369 | } |
370 | 370 | ||
371 | const struct proc_ns_operations pidns_operations = { | 371 | const struct proc_ns_operations pidns_operations = { |