Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2d82909 authored by Tejun Heo's avatar Tejun Heo
Browse files

workqueue: invert the order between pool->lock and wq_mayday_lock 



Currently, pool->lock nests inside pool->lock.  There's no inherent
reason for this order.  The only place where the two locks are held
together is pool_mayday_timeout() and it just got decided that way.

This nesting order turns out to complicate things with the planned
rescuer_thread() update.  Let's invert them.  This doesn't cause any
behavior differences.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reviewed-by: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
Cc: NeilBrown <neilb@suse.de>
Cc: Dongsu Park <dongsu.park@profitbricks.com>
parent 0479c8c5

kernel/workqueue.c

+4 −4
Original line number Diff line number Diff line
@@ -1804,8 +1804,8 @@ static void pool_mayday_timeout(unsigned long __pool) 
	struct worker_pool *pool = (void *)__pool;

	struct work_struct *work;



	spin_lock_irq(&wq_mayday_lock);		/* for wq->maydays */

	spin_lock(&pool->lock);

	spin_lock_irq(&pool->lock);

	spin_lock(&wq_mayday_lock);		/* for wq->maydays */



	if (need_to_create_worker(pool)) {

		/*
@@ -1818,8 +1818,8 @@ static void pool_mayday_timeout(unsigned long __pool) 
			send_mayday(work);

	}



	spin_unlock(&pool->lock);

	spin_unlock_irq(&wq_mayday_lock);

	spin_unlock(&wq_mayday_lock);

	spin_unlock_irq(&pool->lock);



	mod_timer(&pool->mayday_timer, jiffies + MAYDAY_INTERVAL);

}