diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/user.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/user.c b/kernel/user.c index 71dd2363ab0f..d65fec0615a0 100644 --- a/kernel/user.c +++ b/kernel/user.c | |||
@@ -58,7 +58,7 @@ struct user_struct root_user = { | |||
58 | .files = ATOMIC_INIT(0), | 58 | .files = ATOMIC_INIT(0), |
59 | .sigpending = ATOMIC_INIT(0), | 59 | .sigpending = ATOMIC_INIT(0), |
60 | .locked_shm = 0, | 60 | .locked_shm = 0, |
61 | .user_ns = &init_user_ns, | 61 | ._user_ns = &init_user_ns, |
62 | }; | 62 | }; |
63 | 63 | ||
64 | /* | 64 | /* |
@@ -72,7 +72,7 @@ static void uid_hash_insert(struct user_struct *up, struct hlist_head *hashent) | |||
72 | static void uid_hash_remove(struct user_struct *up) | 72 | static void uid_hash_remove(struct user_struct *up) |
73 | { | 73 | { |
74 | hlist_del_init(&up->uidhash_node); | 74 | hlist_del_init(&up->uidhash_node); |
75 | put_user_ns(up->user_ns); | 75 | put_user_ns(up->_user_ns); /* It is safe to free the uid hash table now */ |
76 | } | 76 | } |
77 | 77 | ||
78 | static struct user_struct *uid_hash_find(uid_t uid, struct hlist_head *hashent) | 78 | static struct user_struct *uid_hash_find(uid_t uid, struct hlist_head *hashent) |
@@ -153,7 +153,7 @@ struct user_struct *alloc_uid(struct user_namespace *ns, uid_t uid) | |||
153 | new->uid = uid; | 153 | new->uid = uid; |
154 | atomic_set(&new->__count, 1); | 154 | atomic_set(&new->__count, 1); |
155 | 155 | ||
156 | new->user_ns = get_user_ns(ns); | 156 | new->_user_ns = get_user_ns(ns); |
157 | 157 | ||
158 | /* | 158 | /* |
159 | * Before adding this, check whether we raced | 159 | * Before adding this, check whether we raced |