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/user_namespace.c | |
| parent | cac7f2429872d3733dc3f9915857b1691da2eb2f (diff) | |
| download | linux-435d5f4bb2ccba3b791d9ef61d2590e30b8e806e.tar.gz linux-435d5f4bb2ccba3b791d9ef61d2590e30b8e806e.tar.bz2 linux-435d5f4bb2ccba3b791d9ef61d2590e30b8e806e.zip | |
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/user_namespace.c')
| -rw-r--r-- | kernel/user_namespace.c | 6 |
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) if (!ns) return -ENOMEM; - ret = proc_alloc_inum(&ns->proc_inum); + ret = proc_alloc_inum(&ns->ns.inum); if (ret) { kmem_cache_free(user_ns_cachep, ns); return ret; @@ -136,7 +136,7 @@ void free_user_ns(struct user_namespace *ns) #ifdef CONFIG_PERSISTENT_KEYRINGS key_put(ns->persistent_keyring_register); #endif - proc_free_inum(ns->proc_inum); + proc_free_inum(ns->ns.inum); kmem_cache_free(user_ns_cachep, ns); ns = parent; } while (atomic_dec_and_test(&parent->count)); @@ -891,7 +891,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns) static unsigned int userns_inum(void *ns) { struct user_namespace *user_ns = ns; - return user_ns->proc_inum; + return user_ns->ns.inum; } const struct proc_ns_operations userns_operations = { |