copy_process: error path cleanup

PATCH New Oleg Nesterov 1 participant 1 message Dec 12, 2005

Subsystems (3)

MM core Scheduler exec and binfmt

lore

Share & tools

lore

Oleg Nesterov

author

2005-12-12 16:58 UTC #0 lore raw

PATCH 1/1 copy_process: error path cleanup

This patch moves 'fork_out:' under 'bad_fork_free:', and removes now unneeded 'if (retval)' check.

Signed-off-by Oleg Nesterov <[email protected]>

kernel/fork.c renamed from kernel/fork.c~ +2 -5

@@ -1141,11 +1141,7 @@ static task_t *copy_process(unsigned lon
 	write_unlock_irq(&tasklist_lock);
 	proc_fork_connector(p);
 	cpuset_fork(p);
-	retval = 0;
 
-fork_out:
-	if (retval)
-		return ERR_PTR(retval);
 	return p;
 
 bad_fork_cleanup_namespace:

@@ -1184,7 +1180,8 @@ bad_fork_cleanup_count:
 	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)