* [PATCH 3/5] do_wait: simplify retval/tsk_result/notask_error mess
@ 2009-05-07 6:46 Oleg Nesterov
2009-05-07 7:26 ` Roland McGrath
0 siblings, 1 reply; 2+ messages in thread
From: Oleg Nesterov @ 2009-05-07 6:46 UTC (permalink / raw)
To: Andrew Morton
Cc: Ingo Molnar, Roland McGrath, Vitaly Mayatskikh, linux-kernel
Now that we don't pass &retval down to other helpers we can simplify
the code more.
- kill tsk_result, just use retval
- add the "notask" label right after the main loop, and
s/got end/goto notask/ after the fastpath pid check.
This way we don't need to initialize retval before this
check and the code becomes a bit more clean, if this pid
has no attached tasks we should just skip the list search.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
kernel/exit.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
--- PTRACE/kernel/exit.c~3_RETVAL 2009-05-07 04:37:49.000000000 +0200
+++ PTRACE/kernel/exit.c 2009-05-07 05:09:51.000000000 +0200
@@ -1576,27 +1576,22 @@ repeat:
* might later match our criteria, even if we are not able to reap
* it yet.
*/
- retval = wo->notask_error = -ECHILD;
+ wo->notask_error = -ECHILD;
if ((wo->wo_type < PIDTYPE_MAX) &&
(!wo->wo_pid || hlist_empty(&wo->wo_pid->tasks[wo->wo_type])))
- goto end;
+ goto notask;
current->state = TASK_INTERRUPTIBLE;
read_lock(&tasklist_lock);
tsk = current;
do {
- int tsk_result = do_wait_thread(wo, tsk);
-
- if (!tsk_result)
- tsk_result = ptrace_do_wait(wo, tsk);
+ retval = do_wait_thread(wo, tsk);
+ if (retval)
+ goto end;
- if (tsk_result) {
- /*
- * tasklist_lock is unlocked and we have a final result.
- */
- retval = tsk_result;
+ retval = ptrace_do_wait(wo, tsk);
+ if (retval)
goto end;
- }
if (wo->wo_flags & __WNOTHREAD)
break;
@@ -1605,6 +1600,7 @@ repeat:
} while (tsk != current);
read_unlock(&tasklist_lock);
+notask:
retval = wo->notask_error;
if (!retval && !(wo->wo_flags & WNOHANG)) {
retval = -ERESTARTSYS;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 3/5] do_wait: simplify retval/tsk_result/notask_error mess
2009-05-07 6:46 [PATCH 3/5] do_wait: simplify retval/tsk_result/notask_error mess Oleg Nesterov
@ 2009-05-07 7:26 ` Roland McGrath
0 siblings, 0 replies; 2+ messages in thread
From: Roland McGrath @ 2009-05-07 7:26 UTC (permalink / raw)
To: Oleg Nesterov; +Cc: Andrew Morton, Ingo Molnar, Vitaly Mayatskikh, linux-kernel
Acked-by: Roland McGrath <roland@redhat.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-05-07 7:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-05-07 6:46 [PATCH 3/5] do_wait: simplify retval/tsk_result/notask_error mess Oleg Nesterov
2009-05-07 7:26 ` Roland McGrath
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.