1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index bb320573bb9e..b5f41d4c2eec 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -11,7 +11,7 @@
 
 struct user_namespace {
         struct kref             kref;
-        struct list_head        uidhash_table[UIDHASH_SZ];
+        struct hlist_head       uidhash_table[UIDHASH_SZ];
         struct user_struct      *root_user;
 };
 
@@ -49,7 +49,7 @@ static inline struct user_namespace *copy_user_ns(int flags,
         if (flags & CLONE_NEWUSER)
                 return ERR_PTR(-EINVAL);
 
-        return NULL;
+        return old_ns;
 }
 
 static inline void put_user_ns(struct user_namespace *ns)