Merge Trond's bugfixes

[~andy/linux] / kernel / user.c

diff --git a/kernel/user.c b/kernel/user.c
index b815fefbe76fa4743bd3081af6c6e469dff2f4db..750acffbe9ec5b20191607040c7ec8e840158253 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -38,6 +38,14 @@ struct user_namespace init_user_ns = {
                        .count = 4294967295U,
                },
        },
+       .projid_map = {
+               .nr_extents = 1,
+               .extent[0] = {
+                       .first = 0,
+                       .lower_first = 0,
+                       .count = 4294967295U,
+               },
+       },
        .kref = {
                .refcount       = ATOMIC_INIT(3),
        },