Hi Andi, Ingo,
Recently the return value of wait_for_completion_interruptible() in case of
succesful completion has changed:
- in 2.6.23, it returns 0 on completion,
- in current linux-2.6.git, it returns -1 on completion.
I.e. this breaks all code that checks for a non-zero return value instead
of explicitly comparing with -ERESTARTSYS.
I suspect this is caused by the recent completion refactoring?
With kind regards,
Geert Uytterhoeven
Software Architect
Sony Network and Software Technology Center Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium
Phone: +32 (0)2 700 8453
Fax: +32 (0)2 700 8622
E-mail: [email protected]
Internet: http://www.sony-europe.com/
Sony Network and Software Technology Center Europe
A division of Sony Service Centre (Europe) N.V.
Registered office: Technologielaan 7 · B-1840 Londerzeel · Belgium
VAT BE 0413.825.160 · RPR Brussels
Fortis Bank Zaventem · Swift GEBABEBB08A · IBAN BE39001382358619
> I suspect this is caused by the recent completion refactoring?
Yes. Here's a patch to fix it.
Fix return value of wait_for_completion_interruptible()
The recent w_f_c() changes broke the return value of
wait_for_completion_interruptible(). Previously it returned 0 on success,
now -1. Fix that.
Problem found by Geert Uytterhoeven
Signed-off-by: Andi Kleen <[email protected]>
Index: linux/kernel/sched.c
===================================================================
--- linux/kernel/sched.c
+++ linux/kernel/sched.c
@@ -3751,7 +3751,10 @@ EXPORT_SYMBOL(wait_for_completion_timeou
int __sched wait_for_completion_interruptible(struct completion *x)
{
- return wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_INTERRUPTIBLE);
+ long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_INTERRUPTIBLE);
+ if (t == -ERESTARTSYS)
+ return t;
+ return 0;
}
EXPORT_SYMBOL(wait_for_completion_interruptible);
* Andi Kleen <[email protected]> wrote:
> > I suspect this is caused by the recent completion refactoring?
>
> Yes. Here's a patch to fix it.
>
> Fix return value of wait_for_completion_interruptible()
>
> The recent w_f_c() changes broke the return value of
> wait_for_completion_interruptible(). Previously it returned 0 on
> success, now -1. Fix that.
argh. _Please_ be a bit more careful with cleanups.
applied.
Ingo