Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe7d37d1 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

[PATCH] copy_process: error path cleanup 



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

Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ddc0f846

kernel/fork.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -1146,11 +1146,6 @@ static task_t *copy_process(unsigned long clone_flags, 
	total_forks++;

	total_forks++;

	write_unlock_irq(&tasklist_lock);

	write_unlock_irq(&tasklist_lock);

	proc_fork_connector(p);

	proc_fork_connector(p);

	retval = 0;



fork_out:

	if (retval)

		return ERR_PTR(retval);

	return p;

	return p;





bad_fork_cleanup_namespace:

bad_fork_cleanup_namespace:
@@ -1191,7 +1186,8 @@ static task_t *copy_process(unsigned long clone_flags, 
	free_uid(p->user);

	free_uid(p->user);

bad_fork_free:

bad_fork_free:

	free_task(p);

	free_task(p);

	goto fork_out;

fork_out:

	return ERR_PTR(retval);

}

}





struct pt_regs * __devinit __attribute__((weak)) idle_regs(struct pt_regs *regs)

struct pt_regs * __devinit __attribute__((weak)) idle_regs(struct pt_regs *regs)