diff options
author | Lai Jiangshan <laijs@cn.fujitsu.com> | 2014-06-03 09:32:52 +0200 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-06-19 18:29:12 +0200 |
commit | b62c075194f409ed887670af897ad22d44ed8ac8 (patch) | |
tree | 788003e6b449e5e00ed24c223794b2e69b431a1d /kernel/workqueue.c | |
parent | workqueue: remove useless WARN_ON_ONCE() (diff) | |
download | linux-b62c075194f409ed887670af897ad22d44ed8ac8.tar.xz linux-b62c075194f409ed887670af897ad22d44ed8ac8.zip |
workqueue: clear leftover flags when detached
When a worker is detached, the worker->flags may still have WORKER_UNBOUND
or WORKER_REBOUND, it is OK for all cases:
1) if it is a normal worker, the worker will be dead, it is OK.
2) if it is a rescuer, it may re-attach to a pool with this leftover flag[s],
it is still correct except it may cause unneeded wakeup.
It is correct but not good, so we just remove the leftover flags.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/workqueue.c')
-rw-r--r-- | kernel/workqueue.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 4cfcd027e4bf..4f8d72dae0e8 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1663,6 +1663,9 @@ static void worker_detach_from_pool(struct worker *worker, detach_completion = pool->detach_completion; mutex_unlock(&pool->attach_mutex); + /* clear leftover flags without pool->lock after it is detached */ + worker->flags &= ~(WORKER_UNBOUND | WORKER_REBOUND); + if (detach_completion) complete(detach_completion); } |