1 files changed, 6 insertions, 5 deletions

diff --git a/kernel/user.c b/kernel/user.c
index 750acffbe9ec..8e635a18ab52 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -16,6 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/export.h>
 #include <linux/user_namespace.h>
+#include <linux/proc_fs.h>
 
 /*
  * userns count is 1 for root user, 1 for init_uts_ns,
@@ -46,11 +47,12 @@ struct user_namespace init_user_ns = {
                         .count = 4294967295U,
                 },
         },
-        .kref = {
-                .refcount       = ATOMIC_INIT(3),
-        },
+        .count = ATOMIC_INIT(3),
         .owner = GLOBAL_ROOT_UID,
         .group = GLOBAL_ROOT_GID,
+        .proc_inum = PROC_USER_INIT_INO,
+        .may_mount_sysfs = true,
+        .may_mount_proc = true,
 };
 EXPORT_SYMBOL_GPL(init_user_ns);
 
@@ -105,9 +107,8 @@ static void uid_hash_remove(struct user_struct *up)
 static struct user_struct *uid_hash_find(kuid_t uid, struct hlist_head *hashent)
 {
         struct user_struct *user;
-        struct hlist_node *h;
 
-        hlist_for_each_entry(user, h, hashent, uidhash_node) {
+        hlist_for_each_entry(user, hashent, uidhash_node) {
                 if (uid_eq(user->uid, uid)) {
                         atomic_inc(&user->__count);
                         return user;