common object embedded into various struct ....ns

[deliverable/linux.git] / fs / namespace.c

diff --git a/fs/namespace.c b/fs/namespace.c
index 5b66b2b3624d0da0efe405a6ecb4c86e07a0b58f..adc2ea2532a04fc0ffb686f125dbdccffdbee6b8 100644 (file)
--- 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 = {