userns: use union in {g,u}idmap struct

[sfrench/cifs-2.6.git] / kernel / user.c

diff --git a/kernel/user.c b/kernel/user.c
index 00281add65b251d484616264dbba8df8b0ae066d..9a20acce460d53cf23f7057c7dc122b685ae639d 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -26,26 +26,32 @@
 struct user_namespace init_user_ns = {
        .uid_map = {
                .nr_extents = 1,
-               .extent[0] = {
-                       .first = 0,
-                       .lower_first = 0,
-                       .count = 4294967295U,
+               {
+                       .extent[0] = {
+                               .first = 0,
+                               .lower_first = 0,
+                               .count = 4294967295U,
+                       },
                },
        },
        .gid_map = {
                .nr_extents = 1,
-               .extent[0] = {
-                       .first = 0,
-                       .lower_first = 0,
-                       .count = 4294967295U,
+               {
+                       .extent[0] = {
+                               .first = 0,
+                               .lower_first = 0,
+                               .count = 4294967295U,
+                       },
                },
        },
        .projid_map = {
                .nr_extents = 1,
-               .extent[0] = {
-                       .first = 0,
-                       .lower_first = 0,
-                       .count = 4294967295U,
+               {
+                       .extent[0] = {
+                               .first = 0,
+                               .lower_first = 0,
+                               .count = 4294967295U,
+                       },
                },
        },
        .count = ATOMIC_INIT(3),