copy address of proc_ns_ops into ns_common

[linux-2.6-block.git] / kernel / user.c

diff --git a/kernel/user.c b/kernel/user.c
index 4efa39350e4401213d15a06987e7603460121ef7..69b800aebf13574a4b3a57445016a62d83e9d87b 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
 #ifdef CONFIG_PERSISTENT_KEYRINGS
        .persistent_keyring_register_sem =
        __RWSEM_INITIALIZER(init_user_ns.persistent_keyring_register_sem),