diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2011-11-17 00:59:43 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-04-07 19:55:52 -0400 |
commit | aeb3ae9da9b50a386b22af786d19b623e8d9f0fa (patch) | |
tree | 3db9772ea99c931914bec7ded51f896f1d2e24ec /include/linux/user_namespace.h | |
parent | 0093ccb68f3753c0ba4d74c89d7e0f444b8d6123 (diff) |
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.h | 1 |
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 @@ | |||
12 | struct user_namespace { | 12 | struct user_namespace { |
13 | struct kref kref; | 13 | struct kref kref; |
14 | struct hlist_head uidhash_table[UIDHASH_SZ]; | 14 | struct hlist_head uidhash_table[UIDHASH_SZ]; |
15 | struct user_namespace *parent; | ||
15 | struct user_struct *creator; | 16 | struct user_struct *creator; |
16 | struct work_struct destroyer; | 17 | struct work_struct destroyer; |
17 | }; | 18 | }; |