lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sched: refactor wait_for_completion_timeout()

Browse Source 
Simplify the code and fix the boundary condition of
wait_for_completion_timeout(,0).

We can kill the first __remove_wait_queue() as well.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
This commit is contained in:
Oleg Nesterov
2008-06-20 18:32:20 +04:00
committed by Ingo Molnar
parent bb10ed0994
commit ea71a54670
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kernel/sched.c
View File

@@ -4398,32 +4398,20 @@ do_wait_for_common(struct completion *x, long timeout, int state)
signal_pending(current)) || signal_pending(current)) ||
(state == TASK_KILLABLE && (state == TASK_KILLABLE &&
fatal_signal_pending(current))) { fatal_signal_pending(current))) {
__remove_wait_queue(&x->wait, &wait); timeout = -ERESTARTSYS;
return -ERESTARTSYS; break;
} }
__set_current_state(state); __set_current_state(state);
spin_unlock_irq(&x->wait.lock); spin_unlock_irq(&x->wait.lock);
timeout = schedule_timeout(timeout); timeout = schedule_timeout(timeout);
spin_lock_irq(&x->wait.lock); spin_lock_irq(&x->wait.lock);
} while (!x->done && timeout);
/*
* If the completion has arrived meanwhile
* then return 1 jiffy time left:
*/
if (x->done && !timeout) {
timeout = 1;
break;
}
if (!timeout) {
__remove_wait_queue(&x->wait, &wait);
return timeout;
}
} while (!x->done);
__remove_wait_queue(&x->wait, &wait); __remove_wait_queue(&x->wait, &wait);
if (!x->done)
return timeout;
} }
x->done--; x->done--;
return timeout; return timeout ?: 1;
} }
static long __sched static long __sched