aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/user_namespace.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/user_namespace.c')
-rw-r--r--kernel/user_namespace.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index aa312b0dc3ec..fde584082673 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -86,7 +86,7 @@ int create_user_ns(struct cred *new)
86 if (!ns) 86 if (!ns)
87 return -ENOMEM; 87 return -ENOMEM;
88 88
89 ret = proc_alloc_inum(&ns->proc_inum); 89 ret = proc_alloc_inum(&ns->ns.inum);
90 if (ret) { 90 if (ret) {
91 kmem_cache_free(user_ns_cachep, ns); 91 kmem_cache_free(user_ns_cachep, ns);
92 return ret; 92 return ret;
@@ -136,7 +136,7 @@ void free_user_ns(struct user_namespace *ns)
136#ifdef CONFIG_PERSISTENT_KEYRINGS 136#ifdef CONFIG_PERSISTENT_KEYRINGS
137 key_put(ns->persistent_keyring_register); 137 key_put(ns->persistent_keyring_register);
138#endif 138#endif
139 proc_free_inum(ns->proc_inum); 139 proc_free_inum(ns->ns.inum);
140 kmem_cache_free(user_ns_cachep, ns); 140 kmem_cache_free(user_ns_cachep, ns);
141 ns = parent; 141 ns = parent;
142 } while (atomic_dec_and_test(&parent->count)); 142 } while (atomic_dec_and_test(&parent->count));
@@ -891,7 +891,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
891static unsigned int userns_inum(void *ns) 891static unsigned int userns_inum(void *ns)
892{ 892{
893 struct user_namespace *user_ns = ns; 893 struct user_namespace *user_ns = ns;
894 return user_ns->proc_inum; 894 return user_ns->ns.inum;
895} 895}
896 896
897const struct proc_ns_operations userns_operations = { 897const struct proc_ns_operations userns_operations = {