[PATCH 02/13] workqueue: fix work_busy()

Lai Jiangshan
2013-01-31T18:42:05Z

Even get_work_pool() return NULL, the work may be pending.
Make work_pending() test unconditionally.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
kernel/workqueue.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 973b290..d474a6c 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -3443,8 +3443,6 @@ EXPORT_SYMBOL_GPL(workqueue_congested);
* Test whether @work is currently pending or running. There is no
* synchronization around this function and the test result is
* unreliable and only useful as advisory hints or for debugging.
- * Especially for reentrant wqs, the pending state might hide the
- * running state.
*
* RETURNS:
* OR'd bitmask of WORK_BUSY_* bits.
@@ -3453,15 +3451,13 @@ unsigned int work_busy(struct work_struct *work)
{
struct worker_pool *pool = get_work_pool(work);
unsigned long flags;
- unsigned int ret = 0;
+ unsigned int ret = work_pending(work) ? WORK_BUSY_PENDING : 0;

if (!pool)
- return 0;
+ return ret;

spin_lock_irqsave(&pool->lock, flags);

- if (work_pending(work))
- ret |= WORK_BUSY_PENDING;
if (find_worker_executing_work(pool, work))
ret |= WORK_BUSY_RUNNING;

--
1.7.7.6