fork: move the real prepare_to_copy() users to arch_dup_task_struct()

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / fork.c

diff --git a/kernel/fork.c b/kernel/fork.c
index b9372a0bff18c2a042cb4ef7f6d6ea7b25a3583c..7aed746ff47c82a5532e73244a3c33e027cfe7ae 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -47,6 +47,7 @@
 #include <linux/audit.h>
 #include <linux/memcontrol.h>
 #include <linux/ftrace.h>
+#include <linux/proc_fs.h>
 #include <linux/profile.h>
 #include <linux/rmap.h>
 #include <linux/ksm.h>
@@ -260,8 +261,6 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
        int node = tsk_fork_get_node(orig);
        int err;
 
-       prepare_to_copy(orig);
-
        tsk = alloc_task_struct_node(node);
        if (!tsk)
                return NULL;
@@ -1464,6 +1463,8 @@ bad_fork_cleanup_io:
        if (p->io_context)
                exit_io_context(p);
 bad_fork_cleanup_namespaces:
+       if (unlikely(clone_flags & CLONE_NEWPID))
+               pid_ns_release_proc(p->nsproxy->pid_ns);
        exit_task_namespaces(p);
 bad_fork_cleanup_mm:
        if (p->mm)