Messages in this thread Patch in this message | | | Date | Mon, 7 Oct 2013 20:31:06 +0200 | From | Oleg Nesterov <> | Subject | [PATCH 1/1] sched/wait: wait_event*_timeout() needs ___wait_cond_timeout() too |
| |
Commit 4c663cfc ("wait: fix false timeouts when using wait_event_timeout()") introduced the additional condition checks after a timeout but only in the "slow" __wait*() paths.
wait_event_timeout(wq, CONDITION, 0) still returns 0 if CONDITION is already true and we do not call __wait*().
Now that we have ___wait_cond_timeout() we can use it instead to ensure that __ret will be properly updated.
Signed-off-by: Oleg Nesterov <oleg@redhat.com> --- include/linux/wait.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/linux/wait.h b/include/linux/wait.h index ff9e20f..ec099b0 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -273,7 +273,7 @@ do { \ #define wait_event_timeout(wq, condition, timeout) \ ({ \ long __ret = timeout; \ - if (!(condition)) \ + if (!___wait_cond_timeout(condition)) \ __ret = __wait_event_timeout(wq, condition, timeout); \ __ret; \ }) @@ -331,7 +331,7 @@ do { \ #define wait_event_interruptible_timeout(wq, condition, timeout) \ ({ \ long __ret = timeout; \ - if (!(condition)) \ + if (!___wait_cond_timeout(condition)) \ __ret = __wait_event_interruptible_timeout(wq, \ condition, timeout); \ __ret; \ @@ -772,7 +772,7 @@ do { \ timeout) \ ({ \ long __ret = timeout; \ - if (!(condition)) \ + if (!___wait_cond_timeout(condition)) \ __ret = __wait_event_interruptible_lock_irq_timeout( \ wq, condition, lock, timeout); \ __ret; \ -- 1.5.5.1
| |