summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLai Jiangshan <laijs@cn.fujitsu.com>2014-07-22 13:03:47 +0800
committerTejun Heo <tj@kernel.org>2014-07-22 12:10:39 -0400
commit13b1d625ef430ab7af059099828e1b9fba622369 (patch)
tree06bf10c056c08e82dc39526394cea25009ef05fc /kernel
parent051e1850106687896d4c4eeaf6ae4d61c4862e85 (diff)
workqueue: move rescuer pool detachment to the end
In 51697d393922 ("workqueue: use generic attach/detach routine for rescuers"), The rescuer detaches itself from the pool before put_pwq() so that the put_unbound_pool() will not destroy the rescuer-attached pool. It is unnecessary. worker_detach_from_pool() can be used as the last statement to access to the pool just like the regular workers, put_unbound_pool() will wait for it to detach and then free the pool. So we move the worker_detach_from_pool() down, make it coincide with the regular workers. tj: Minor description update. Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/workqueue.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 4cb8527a5783..4d9600faa400 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -2253,15 +2253,10 @@ repeat:
move_linked_works(work, scheduled, &n);
process_scheduled_works(rescuer);
- spin_unlock_irq(&pool->lock);
-
- worker_detach_from_pool(rescuer, pool);
-
- spin_lock_irq(&pool->lock);
/*
* Put the reference grabbed by send_mayday(). @pool won't
- * go away while we're holding its lock.
+ * go away while we're still attached to it.
*/
put_pwq(pwq);
@@ -2274,8 +2269,11 @@ repeat:
wake_up_worker(pool);
rescuer->pool = NULL;
- spin_unlock(&pool->lock);
- spin_lock(&wq_mayday_lock);
+ spin_unlock_irq(&pool->lock);
+
+ worker_detach_from_pool(rescuer, pool);
+
+ spin_lock_irq(&wq_mayday_lock);
}
spin_unlock_irq(&wq_mayday_lock);