On 12/04/2014 11:11 PM, Tejun Heo wrote: > 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 <[email protected]> > Cc: NeilBrown <[email protected]> > Cc: Dongsu Park <[email protected]> > Cc: Lai Jiangshan <[email protected]>
Reviewed-by: Lai Jiangshan <[email protected]> > --- > kernel/workqueue.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > --- a/kernel/workqueue.c > +++ b/kernel/workqueue.c > @@ -1804,8 +1804,8 @@ static void pool_mayday_timeout(unsigned > 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 > 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); > } > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
