lkml.org 
[lkml]   [2009]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/5] Use copy_wait_opts_to_user() in wait_task_zombie()
    Date
    All copy-paste getrusage() and put_user() code in wait_task_* functions
    is replaced by call to copy_wait_opts_to_user()

    Signed-off-by: Vitaly Mayatskikh <v.mayatskih@gmail.com>
    ---
    kernel/exit.c | 39 +++++++++++----------------------------
    1 files changed, 11 insertions(+), 28 deletions(-)
    diff --git a/kernel/exit.c b/kernel/exit.c
    index a742ae9..9806332 100644
    --- a/kernel/exit.c
    +++ b/kernel/exit.c
    @@ -1165,17 +1165,15 @@ static int wait_noreap_copyout(struct wait_opts *wo, struct task_struct *p,
    static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
    {
    unsigned long state;
    - int retval, status, traced;
    + int retval, why, status, traced;
    pid_t pid = task_pid_vnr(p);
    uid_t uid = __task_cred(p)->uid;
    - struct siginfo __user *infop;

    if (!likely(wo->wo_flags & WEXITED))
    return 0;

    if (unlikely(wo->wo_flags & WNOWAIT)) {
    int exit_code = p->exit_code;
    - int why, status;

    get_task_struct(p);
    read_unlock(&tasklist_lock);
    @@ -1267,36 +1265,21 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
    */
    read_unlock(&tasklist_lock);

    - retval = wo->wo_rusage
    - ? getrusage(p, RUSAGE_BOTH, wo->wo_rusage) : 0;
    status = (p->signal->flags & SIGNAL_GROUP_EXIT)
    ? p->signal->group_exit_code : p->exit_code;
    - if (!retval && wo->wo_stat)
    + if (wo->wo_stat)
    retval = put_user(status, wo->wo_stat);

    - infop = wo->wo_info;
    - if (!retval && infop)
    - retval = put_user(SIGCHLD, &infop->si_signo);
    - if (!retval && infop)
    - retval = put_user(0, &infop->si_errno);
    - if (!retval && infop) {
    - int why;
    -
    - if ((status & 0x7f) == 0) {
    - why = CLD_EXITED;
    - status >>= 8;
    - } else {
    - why = (status & 0x80) ? CLD_DUMPED : CLD_KILLED;
    - status &= 0x7f;
    - }
    - retval = put_user((short)why, &infop->si_code);
    - if (!retval)
    - retval = put_user(status, &infop->si_status);
    + if ((status & 0x7f) == 0) {
    + why = CLD_EXITED;
    + status >>= 8;
    + } else {
    + why = (status & 0x80) ? CLD_DUMPED : CLD_KILLED;
    + status &= 0x7f;
    }
    - if (!retval && infop)
    - retval = put_user(pid, &infop->si_pid);
    - if (!retval && infop)
    - retval = put_user(uid, &infop->si_uid);
    +
    + retval = copy_wait_opts_to_user(wo, p, pid, uid, why, status, SIGCHLD);
    +
    if (!retval)
    retval = pid;

    --
    1.6.2.2



    \
     
     \ /
      Last update: 2009-05-11 15:31    [W:0.331 / U:0.460 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site