Commit 6bf41237 authored by NeilBrown's avatar NeilBrown Committed by Ingo Molnar

sched: Change wait_for_completion_*_timeout() to return a signed long

wait_for_completion_*_timeout() can return:

   0: if the wait timed out
 -ve: if the wait was interrupted
 +ve: if the completion was completed.

As they currently return an 'unsigned long', the last two cases
are not easily distinguished which can easily result in buggy
code, as is the case for the recently added
wait_for_completion_interruptible_timeout() call in
net/sunrpc/cache.c

So change them both to return 'long'.  As MAX_SCHEDULE_TIMEOUT
is LONG_MAX, a large +ve return value should never overflow.
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: J.  Bruce Fields <bfields@fieldses.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <20110105125016.64ccab0e@notabene.brown>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 27066fd4
...@@ -81,10 +81,10 @@ extern int wait_for_completion_interruptible(struct completion *x); ...@@ -81,10 +81,10 @@ extern int wait_for_completion_interruptible(struct completion *x);
extern int wait_for_completion_killable(struct completion *x); extern int wait_for_completion_killable(struct completion *x);
extern unsigned long wait_for_completion_timeout(struct completion *x, extern unsigned long wait_for_completion_timeout(struct completion *x,
unsigned long timeout); unsigned long timeout);
extern unsigned long wait_for_completion_interruptible_timeout( extern long wait_for_completion_interruptible_timeout(
struct completion *x, unsigned long timeout); struct completion *x, unsigned long timeout);
extern unsigned long wait_for_completion_killable_timeout( extern long wait_for_completion_killable_timeout(
struct completion *x, unsigned long timeout); struct completion *x, unsigned long timeout);
extern bool try_wait_for_completion(struct completion *x); extern bool try_wait_for_completion(struct completion *x);
extern bool completion_done(struct completion *x); extern bool completion_done(struct completion *x);
......
...@@ -4395,7 +4395,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible); ...@@ -4395,7 +4395,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
* This waits for either a completion of a specific task to be signaled or for a * This waits for either a completion of a specific task to be signaled or for a
* specified timeout to expire. It is interruptible. The timeout is in jiffies. * specified timeout to expire. It is interruptible. The timeout is in jiffies.
*/ */
unsigned long __sched long __sched
wait_for_completion_interruptible_timeout(struct completion *x, wait_for_completion_interruptible_timeout(struct completion *x,
unsigned long timeout) unsigned long timeout)
{ {
...@@ -4428,7 +4428,7 @@ EXPORT_SYMBOL(wait_for_completion_killable); ...@@ -4428,7 +4428,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
* signaled or for a specified timeout to expire. It can be * signaled or for a specified timeout to expire. It can be
* interrupted by a kill signal. The timeout is in jiffies. * interrupted by a kill signal. The timeout is in jiffies.
*/ */
unsigned long __sched long __sched
wait_for_completion_killable_timeout(struct completion *x, wait_for_completion_killable_timeout(struct completion *x,
unsigned long timeout) unsigned long timeout)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment