lkml.org 
[lkml]   [2009]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/3] Replace wait_noreap_copyout() by copy_wait_opts_to_user()
Date
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 | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/kernel/exit.c b/kernel/exit.c
index f069bc1..cea85c9 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1154,17 +1154,6 @@ static int copy_wait_opts_to_user(struct wait_opts *wo, struct wait_info *wi)
return retval;
}

-static int wait_noreap_copyout(struct wait_opts *wo, struct wait_info *wi)
-{
- int retval;
- wi->signal = SIGCHLD;
- retval = copy_wait_opts_to_user(wo, wi);
- put_task_struct(wi->p);
- if (!retval)
- retval = wi->pid;
- return retval;
-}
-
/*
* Handle sys_wait4 work for one task in state EXIT_ZOMBIE. We hold
* read_lock(&tasklist_lock) on entry. If we return zero, we still hold
@@ -1194,7 +1183,11 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
wi.why = (wi.status & 0x80) ? CLD_DUMPED : CLD_KILLED;
wi.status &= 0x7f;
}
- return wait_noreap_copyout(wo, &wi);
+ retval = copy_wait_opts_to_user(wo, &wi);
+ put_task_struct(p);
+ if (!retval)
+ retval = wi.pid;
+ return retval;
}

/*
--
1.6.2.2



\
 
 \ /
  Last update: 2009-05-13 14:11    [from the cache]
©2003-2011 Jasper Spaans