Commit a6895399 authored by Rolf Eike Beer's avatar Rolf Eike Beer Committed by Linus Torvalds
Browse files

kernel/fork.c: simplify copy_mm() 

All this can happen without a single goto.

Link: https://lkml.kernel.org/r/2072685.XptgVkyDqn@devpool47


Signed-off-by: default avatarRolf Eike Beer <eb@emlix.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5449162a

kernel/fork.c

+4 −11
Original line number Diff line number Diff line
@@ -1396,7 +1396,6 @@ static struct mm_struct *dup_mm(struct task_struct *tsk, 
static int copy_mm(unsigned long clone_flags, struct task_struct *tsk)

{

	struct mm_struct *mm, *oldmm;

	int retval;



	tsk->min_flt = tsk->maj_flt = 0;

	tsk->nvcsw = tsk->nivcsw = 0;
@@ -1423,21 +1422,15 @@ static int copy_mm(unsigned long clone_flags, struct task_struct *tsk) 
	if (clone_flags & CLONE_VM) {

		mmget(oldmm);

		mm = oldmm;

		goto good_mm;

	}



	retval = -ENOMEM;

	} else {

		mm = dup_mm(tsk, current->mm);

		if (!mm)

		goto fail_nomem;

			return -ENOMEM;

	}



good_mm:

	tsk->mm = mm;

	tsk->active_mm = mm;

	return 0;



fail_nomem:

	return retval;

}



static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)