projects/linux·commit fe7d37d1

[PATCH] copy_process: error path cleanup

fe7d37d1 · Oleg Nesterov <[email protected]> · 2006-01-08 01:04:02 -08:00

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

Signed-off-by: Oleg Nesterov <[email protected]>
Cc: Ingo Molnar <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
fe7d37d1fbf8ffe78abd72728b24fb0c64f7af55
Parents
ddc0f846

Changes

1 files changed · +2 −6

FileStatusAddDelContent
kernel/fork.cmodified+2−6View file

kernel/fork.c

View file
diff --git a/kernel/fork.c b/kernel/fork.c
index 4bc0bd8..72e3252 100644
--- a/kernel/fork.c
+++ b/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 @@ 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)