tree 9e2fcd9ff6bd990740b3f0a48fc4194f2e64d89f
parent f293ea92007419e4f9c52db0cf57af17f45b9f94
author Oleg Nesterov <oleg@tv-sign.ru> 1178703251 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1178739052 -0700

workqueue: make cancel_rearming_delayed_workqueue() work on idle dwork

cancel_rearming_delayed_workqueue(dwork) will hang forever if dwork was not
scheduled, because in that case cancel_delayed_work()->del_timer_sync() never
returns true.

I don't know if there are any callers which may have problems, but this is not
so convenient, and the fix is very simple.

Q: looks like we don't need "struct workqueue_struct *wq" parameter.  If the
timer was aborted successfully, get_wq_data() == wq.  Is it worth to add the
new function?

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>