workqueue/hotplug: remove the workaround in rebind_workers()
authorLai Jiangshan <jiangshanlai@gmail.com>
Fri, 1 Dec 2017 14:23:07 +0000 (22:23 +0800)
committerTejun Heo <tj@kernel.org>
Mon, 4 Dec 2017 22:46:09 +0000 (14:46 -0800)
Since the cpu/hotplug refactoring, DOWN_FAILED is never called without
preceding DOWN_PREPARE making the workaround unnecessary.  Remove it.

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
kernel/workqueue.c

index 48a4d00..45ce93f 100644 (file)
@@ -4589,16 +4589,6 @@ static void rebind_workers(struct worker_pool *pool)
 
        spin_lock_irq(&pool->lock);
 
-       /*
-        * XXX: CPU hotplug notifiers are weird and can call DOWN_FAILED
-        * w/o preceding DOWN_PREPARE.  Work around it.  CPU hotplug is
-        * being reworked and this can go away in time.
-        */
-       if (!(pool->flags & POOL_DISASSOCIATED)) {
-               spin_unlock_irq(&pool->lock);
-               return;
-       }
-
        pool->flags &= ~POOL_DISASSOCIATED;
 
        for_each_pool_worker(worker, pool) {