Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[cascardo/linux.git] / kernel / user.c

diff --git a/kernel/user.c b/kernel/user.c
index 2d09940..b069ccb 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -50,7 +50,10 @@ struct user_namespace init_user_ns = {
        .count = ATOMIC_INIT(3),
        .owner = GLOBAL_ROOT_UID,
        .group = GLOBAL_ROOT_GID,
-       .proc_inum = PROC_USER_INIT_INO,
+       .ns.inum = PROC_USER_INIT_INO,
+#ifdef CONFIG_USER_NS
+       .ns.ops = &userns_operations,
+#endif
        .flags = USERNS_INIT_FLAGS,
 #ifdef CONFIG_PERSISTENT_KEYRINGS
        .persistent_keyring_register_sem =