commit 435d5f4bb2ccba3b791d9ef61d2590e30b8e806e
author Al Viro <viro@zeniv.linux.org.uk> Fri Oct 31 22:56:04 2014 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Thu Dec 04 14:31:00 2014 -0500
tree d482ef15334a703bbe406dab021880ce3d320870
parent cac7f2429872d3733dc3f9915857b1691da2eb2f

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>

kernel/pid_namespace.c

diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index db95d8e..99e27e5 100644
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -105,7 +105,7 @@
 	if (ns->pid_cachep == NULL)
 		goto out_free_map;
 
-	err = proc_alloc_inum(&ns->proc_inum);
+	err = proc_alloc_inum(&ns->ns.inum);
 	if (err)
 		goto out_free_map;
 
@@ -142,7 +142,7 @@
 {
 	int i;
 
-	proc_free_inum(ns->proc_inum);
+	proc_free_inum(ns->ns.inum);
 	for (i = 0; i < PIDMAP_ENTRIES; i++)
 		kfree(ns->pidmap[i].page);
 	put_user_ns(ns->user_ns);
@@ -365,7 +365,7 @@
 static unsigned int pidns_inum(void *ns)
 {
 	struct pid_namespace *pid_ns = ns;
-	return pid_ns->proc_inum;
+	return pid_ns->ns.inum;
 }
 
 const struct proc_ns_operations pidns_operations = {