summaryrefslogtreecommitdiffstats
path: root/include/linux/user_namespace.h
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2011-11-16 21:59:43 -0800
committerEric W. Biederman <ebiederm@xmission.com>2012-04-07 16:55:52 -0700
commitaeb3ae9da9b50a386b22af786d19b623e8d9f0fa (patch)
tree3db9772ea99c931914bec7ded51f896f1d2e24ec /include/linux/user_namespace.h
parent0093ccb68f3753c0ba4d74c89d7e0f444b8d6123 (diff)
downloadlinux-aeb3ae9da9b50a386b22af786d19b623e8d9f0fa.tar.gz
linux-aeb3ae9da9b50a386b22af786d19b623e8d9f0fa.tar.bz2
linux-aeb3ae9da9b50a386b22af786d19b623e8d9f0fa.zip
userns: Add an explicit reference to the parent user namespace
I am about to remove the struct user_namespace reference from struct user_struct. So keep an explicit track of the parent user namespace. Take advantage of this new reference and replace instances of user_ns->creator->user_ns with user_ns->parent. Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'include/linux/user_namespace.h')
-rw-r--r--include/linux/user_namespace.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index faf467944baf..dc2d85a76376 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -12,6 +12,7 @@
struct user_namespace {
struct kref kref;
struct hlist_head uidhash_table[UIDHASH_SZ];
+ struct user_namespace *parent;
struct user_struct *creator;
struct work_struct destroyer;
};