summaryrefslogtreecommitdiffstats
path: root/kernel/exit.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-05-14 21:25:03 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2017-05-21 13:13:17 -0400
commite61a250229fbf0f003e93676bf4d8a555a8c9eec (patch)
tree10a617c74e7414d8f31fd410a433fa64052c9180 /kernel/exit.c
parent67d7ddded322db99f451a7959d56ed6c70a6c4aa (diff)
downloadlinux-e61a250229fbf0f003e93676bf4d8a555a8c9eec.tar.gz
linux-e61a250229fbf0f003e93676bf4d8a555a8c9eec.tar.bz2
linux-e61a250229fbf0f003e93676bf4d8a555a8c9eec.zip
lift getrusage() from wait_noreap_copyout()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel/exit.c')
-rw-r--r--kernel/exit.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 42f26480b3cc..d4f5097da85a 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1062,9 +1062,6 @@ static int wait_noreap_copyout(struct wait_opts *wo, struct task_struct *p,
{
struct waitid_info *infop;
- if (wo->wo_rusage)
- getrusage(p, RUSAGE_BOTH, wo->wo_rusage);
-
put_task_struct(p);
infop = wo->wo_info;
if (infop) {
@@ -1099,6 +1096,8 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
get_task_struct(p);
read_unlock(&tasklist_lock);
sched_annotate_sleep();
+ if (wo->wo_rusage)
+ getrusage(p, RUSAGE_BOTH, wo->wo_rusage);
if ((exit_code & 0x7f) == 0) {
why = CLD_EXITED;
@@ -1296,12 +1295,12 @@ unlock_sig:
why = ptrace ? CLD_TRAPPED : CLD_STOPPED;
read_unlock(&tasklist_lock);
sched_annotate_sleep();
+ if (wo->wo_rusage)
+ getrusage(p, RUSAGE_BOTH, wo->wo_rusage);
if (unlikely(wo->wo_flags & WNOWAIT))
return wait_noreap_copyout(wo, p, pid, uid, why, exit_code);
- if (wo->wo_rusage)
- getrusage(p, RUSAGE_BOTH, wo->wo_rusage);
wo->wo_stat = (exit_code << 8) | 0x7f;
infop = wo->wo_info;
@@ -1350,10 +1349,10 @@ static int wait_task_continued(struct wait_opts *wo, struct task_struct *p)
get_task_struct(p);
read_unlock(&tasklist_lock);
sched_annotate_sleep();
+ if (wo->wo_rusage)
+ getrusage(p, RUSAGE_BOTH, wo->wo_rusage);
if (!wo->wo_info) {
- if (wo->wo_rusage)
- getrusage(p, RUSAGE_BOTH, wo->wo_rusage);
put_task_struct(p);
wo->wo_stat = 0xffff;
retval = pid;