summaryrefslogtreecommitdiffstats
path: root/fs/namespace.c
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 /fs/namespace.c
parentcac7f2429872d3733dc3f9915857b1691da2eb2f (diff)
downloadlinux-435d5f4bb2ccba3b791d9ef61d2590e30b8e806e.tar.bz2
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 'fs/namespace.c')
-rw-r--r--fs/namespace.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index 5b66b2b3624d..adc2ea2532a0 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -2640,7 +2640,7 @@ dput_out:
static void free_mnt_ns(struct mnt_namespace *ns)
{
- proc_free_inum(ns->proc_inum);
+ proc_free_inum(ns->ns.inum);
put_user_ns(ns->user_ns);
kfree(ns);
}
@@ -2662,7 +2662,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
new_ns = kmalloc(sizeof(struct mnt_namespace), GFP_KERNEL);
if (!new_ns)
return ERR_PTR(-ENOMEM);
- ret = proc_alloc_inum(&new_ns->proc_inum);
+ ret = proc_alloc_inum(&new_ns->ns.inum);
if (ret) {
kfree(new_ns);
return ERR_PTR(ret);
@@ -3201,7 +3201,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
static unsigned int mntns_inum(void *ns)
{
struct mnt_namespace *mnt_ns = ns;
- return mnt_ns->proc_inum;
+ return mnt_ns->ns.inum;
}
const struct proc_ns_operations mntns_operations = {