diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-01 00:25:30 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-04 14:34:11 -0500 |
| commit | 3c0411846118a578de3a979faf2da3ab5fb81179 (patch) | |
| tree | 4609996bb8fdad235f21d0ec87bf1307da8738c0 /kernel/user_namespace.c | |
| parent | ff24870f46d51d79fc74a241fd7c12ccb933c69f (diff) | |
| download | linux-3c0411846118a578de3a979faf2da3ab5fb81179.tar.gz | |
switch the rest of proc_ns_operations to working with &...->ns
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel/user_namespace.c')
| -rw-r--r-- | kernel/user_namespace.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index fde584082673..1ab2209228ff 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -841,6 +841,11 @@ static bool new_idmap_permitted(const struct file *file, return false; } +static inline struct user_namespace *to_user_ns(struct ns_common *ns) +{ + return container_of(ns, struct user_namespace, ns); +} + static void *userns_get(struct task_struct *task) { struct user_namespace *user_ns; @@ -849,17 +854,17 @@ static void *userns_get(struct task_struct *task) user_ns = get_user_ns(__task_cred(task)->user_ns); rcu_read_unlock(); - return user_ns; + return user_ns ? &user_ns->ns : NULL; } static void userns_put(void *ns) { - put_user_ns(ns); + put_user_ns(to_user_ns(ns)); } static int userns_install(struct nsproxy *nsproxy, void *ns) { - struct user_namespace *user_ns = ns; + struct user_namespace *user_ns = to_user_ns(ns); struct cred *cred; /* Don't allow gaining capabilities by reentering @@ -890,8 +895,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->ns.inum; + return ((struct ns_common *)ns)->inum; } const struct proc_ns_operations userns_operations = { |