userns: Simplify the user_namespace by making userns->creator a kuid.

[firefly-linux-kernel-4.4.55.git] / kernel / user.c

diff --git a/kernel/user.c b/kernel/user.c
index 025077e54a7c32831b050ace91beaf9a374f7c45..cff3856591750955c0218abe81dfa86ba63dd51e 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -25,7 +25,8 @@ struct user_namespace init_user_ns = {
        .kref = {
                .refcount       = ATOMIC_INIT(3),
        },
-       .creator = &root_user,
+       .owner = GLOBAL_ROOT_UID,
+       .group = GLOBAL_ROOT_GID,
 };
 EXPORT_SYMBOL_GPL(init_user_ns);
 
@@ -54,9 +55,9 @@ struct hlist_head uidhash_table[UIDHASH_SZ];
  */
 static DEFINE_SPINLOCK(uidhash_lock);
 
-/* root_user.__count is 2, 1 for init task cred, 1 for init_user_ns->user_ns */
+/* root_user.__count is 1, for init task cred */
 struct user_struct root_user = {
-       .__count        = ATOMIC_INIT(2),
+       .__count        = ATOMIC_INIT(1),
        .processes      = ATOMIC_INIT(1),
        .files          = ATOMIC_INIT(0),
        .sigpending     = ATOMIC_INIT(0),