nsproxy: remove INIT_NSPROXY()

[safe/jmp/linux-2.6] / kernel / nsproxy.c

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 63598dc..2ab6723 100644 (file)
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -24,21 +24,27 @@
 
 static struct kmem_cache *nsproxy_cachep;
 
-struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
-
-/*
- * creates a copy of "orig" with refcount 1.
- */
-static inline struct nsproxy *clone_nsproxy(struct nsproxy *orig)
+struct nsproxy init_nsproxy = {
+       .count  = ATOMIC_INIT(1),
+       .uts_ns = &init_uts_ns,
+#if defined(CONFIG_POSIX_MQUEUE) || defined(CONFIG_SYSVIPC)
+       .ipc_ns = &init_ipc_ns,
+#endif
+       .mnt_ns = NULL,
+       .pid_ns = &init_pid_ns,
+#ifdef CONFIG_NET
+       .net_ns = &init_net,
+#endif
+};
+
+static inline struct nsproxy *create_nsproxy(void)
 {
-       struct nsproxy *ns;
+       struct nsproxy *nsproxy;
 
-       ns = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
-       if (ns) {
-               memcpy(ns, orig, sizeof(struct nsproxy));
-               atomic_set(&ns->count, 1);
-       }
-       return ns;
+       nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
+       if (nsproxy)
+               atomic_set(&nsproxy->count, 1);
+       return nsproxy;
 }
 
 /*
@@ -52,7 +58,7 @@ static struct nsproxy *create_new_namespaces(unsigned long flags,
        struct nsproxy *new_nsp;
        int err;
 
-       new_nsp = clone_nsproxy(tsk->nsproxy);
+       new_nsp = create_nsproxy();
        if (!new_nsp)
                return ERR_PTR(-ENOMEM);