Messages in this thread Patch in this message | | | From | Vitaly Mayatskikh <> | Subject | [PATCH 1/2] Completely replace wait_noreap_copyout() by copy_wait_opts_to_user() | Date | Thu, 14 May 2009 11:50:13 +0200 |
| |
wait_noreap_copyout() currently is a short wrapper for copy_wait_opts_to_user(), and wait_task_zombie() is the only one caller of it.
Signed-off-by: Vitaly Mayatskikh <v.mayatskih@gmail.com> --- kernel/exit.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/kernel/exit.c b/kernel/exit.c index f22e82c..3952385 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -1143,14 +1143,6 @@ static int copy_wait_opts_to_user(struct wait_opts *wo, struct task_struct *p, if (!retval) retval = put_user(status, &infop->si_status); } - return retval; -} - -static int wait_noreap_copyout(struct wait_opts *wo, struct task_struct *p, - pid_t pid, uid_t uid, int why, int status) -{ - int retval = copy_wait_opts_to_user(wo, p, pid, uid, why, status, SIGCHLD); - put_task_struct(p); if (!retval) retval = pid; return retval; @@ -1184,7 +1176,10 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p) why = (exit_code & 0x80) ? CLD_DUMPED : CLD_KILLED; status = exit_code & 0x7f; } - return wait_noreap_copyout(wo, p, pid, uid, why, status); + retval = copy_wait_opts_to_user(wo, p, pid, uid, + why, status, SIGCHLD); + put_task_struct(p); + return retval; } /* -- 1.6.2.2
| |