iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Tejun Heo <tj@kernel.org>
Reviewed-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: NeilBrown <neilb@suse.de>
Cc: Dongsu Park <dongsu.park@profitbricks.com>
This commit is contained in:
Tejun Heo 2014-12-08 12:39:16 -05:00
parent 0479c8c549
commit b2d829096b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/workqueue.c
View File

@ -1804,8 +1804,8 @@ static void pool_mayday_timeout(unsigned long __pool)
struct worker_pool *pool = (void *)__pool; struct worker_pool *pool = (void *)__pool;
struct work_struct *work; struct work_struct *work;
spin_lock_irq(&wq_mayday_lock); /* for wq->maydays */ spin_lock_irq(&pool->lock);
spin_lock(&pool->lock); spin_lock(&wq_mayday_lock); /* for wq->maydays */
if (need_to_create_worker(pool)) { if (need_to_create_worker(pool)) {
/* /*
@ -1818,8 +1818,8 @@ static void pool_mayday_timeout(unsigned long __pool)
send_mayday(work); send_mayday(work);
} }
spin_unlock(&pool->lock); spin_unlock(&wq_mayday_lock);
spin_unlock_irq(&wq_mayday_lock); spin_unlock_irq(&pool->lock);
mod_timer(&pool->mayday_timer, jiffies + MAYDAY_INTERVAL); mod_timer(&pool->mayday_timer, jiffies + MAYDAY_INTERVAL);
} }