The patch titled
Subject: kernel/fork.c: simplify copy_mm()
has been added to the -mm tree. Its filename is
simplify-copy_mm.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/simplify-copy_mm.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/simplify-copy_mm.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Rolf Eike Beer <eb@xxxxxxxxx>
Subject: 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: Rolf Eike Beer <eb@xxxxxxxxx>
Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/fork.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
--- a/kernel/fork.c~simplify-copy_mm
+++ a/kernel/fork.c
@@ -1393,7 +1393,6 @@ fail_nomem:
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;
@@ -1420,21 +1419,15 @@ static int copy_mm(unsigned long clone_f
if (clone_flags & CLONE_VM) {
mmget(oldmm);
mm = oldmm;
- goto good_mm;
+ } else {
+ mm = dup_mm(tsk, current->mm);
+ if (!mm)
+ return -ENOMEM;
}
- retval = -ENOMEM;
- mm = dup_mm(tsk, current->mm);
- if (!mm)
- goto fail_nomem;
-
-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)
_
Patches currently in -mm which might be from eb@xxxxxxxxx are
simplify-copy_mm.patch
