From 98aa08f1590547f7464970f2beacc4c3e55d3068 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Sun, 8 Jan 2006 01:04:02 -0800
Subject: [PATCH] --- yaml --- r: 16999 b: refs/heads/master c:
 fe7d37d1fbf8ffe78abd72728b24fb0c64f7af55 h: refs/heads/master i:   16997:
 84afc8b0de0747c40398654ff2d8295029204db3   16995:
 4a6375dd69922f1767826074461a323ce62b6889   16991:
 54619c1ff67cf96a958b2ed9f584215dfb9a7727 v: v3

---
 [refs]              | 2 +-
 trunk/kernel/fork.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index a0fca801feec..b531a620a53e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddc0f846aa7621940b74cee0c91cd26405058a4d
+refs/heads/master: fe7d37d1fbf8ffe78abd72728b24fb0c64f7af55
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index 4bc0bd8ef176..72e3252c6763 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -1146,11 +1146,6 @@ static task_t *copy_process(unsigned long clone_flags,
 	total_forks++;
 	write_unlock_irq(&tasklist_lock);
 	proc_fork_connector(p);
-	retval = 0;
-
-fork_out:
-	if (retval)
-		return ERR_PTR(retval);
 	return p;
 
 bad_fork_cleanup_namespace:
@@ -1191,7 +1186,8 @@ static task_t *copy_process(unsigned long clone_flags,
 	free_uid(p->user);
 bad_fork_free:
 	free_task(p);
-	goto fork_out;
+fork_out:
+	return ERR_PTR(retval);
 }
 
 struct pt_regs * __devinit __attribute__((weak)) idle_regs(struct pt_regs *regs)