The patch titled
wait_task_* cleanups: use copy_wait_opts_to_user() in wait_task_continued()
has been removed from the -mm tree. Its filename was
wait_task_-cleanups-use-copy_wait_opts_to_user-in-wait_task_continued.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: wait_task_* cleanups: use copy_wait_opts_to_user() in wait_task_continued()
From: Vitaly Mayatskikh <v.mayatskih@xxxxxxxxx>
All copy-paste getrusage() and put_user() code in wait_task_* functions is
replaced by call to copy_wait_opts_to_user()
It makes no sense to do conditional siginfo's fill,
copy_wait_opts_to_user() knows how to handle it right.
Signed-off-by: Vitaly Mayatskikh <v.mayatskih@xxxxxxxxx>
Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Roland McGrath <roland@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/exit.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff -puN kernel/exit.c~wait_task_-cleanups-use-copy_wait_opts_to_user-in-wait_task_continued kernel/exit.c
--- a/kernel/exit.c~wait_task_-cleanups-use-copy_wait_opts_to_user-in-wait_task_continued
+++ a/kernel/exit.c
@@ -1422,19 +1422,16 @@ static int wait_task_continued(struct wa
get_task_struct(p);
read_unlock(&tasklist_lock);
- if (!wo->wo_info) {
- retval = wo->wo_rusage
- ? getrusage(p, RUSAGE_BOTH, wo->wo_rusage) : 0;
- put_task_struct(p);
- if (!retval && wo->wo_stat)
- retval = put_user(0xffff, wo->wo_stat);
- if (!retval)
- retval = pid;
- } else {
- retval = wait_noreap_copyout(wo, p, pid, uid,
- CLD_CONTINUED, SIGCONT);
- BUG_ON(retval == 0);
- }
+ retval = copy_wait_opts_to_user(wo, p, pid, uid,
+ CLD_CONTINUED, SIGCONT, SIGCHLD);
+ put_task_struct(p);
+
+ if (!retval && wo->wo_stat)
+ retval = put_user(0xffff, wo->wo_stat);
+ if (!retval)
+ retval = pid;
+
+ BUG_ON(retval == 0);
return retval;
}
_
Patches currently in -mm which might be from v.mayatskih@xxxxxxxxx are
wait_task_-cleanups-use-copy_wait_opts_to_user-in-wait_task_continued.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
