From 2dea5cae251f64d68ee8afdd4e1e742b7781353f Mon Sep 17 00:00:00 2001 From: Lai Jiangshan Date: Mon, 25 Mar 2013 16:57:18 -0700 Subject: [PATCH] --- yaml --- r: 365535 b: refs/heads/master c: 87fc741e94cf64445c698486982b30afa0811eca h: refs/heads/master i: 365533: ba6210423fc9b59c37cb35db5208812e7c06aef9 365531: 12186d2e6f45ed6e54ab73a7931f653cdac7b9bb 365527: 96dfe00725cbdf43344176d336ad4e9da160a235 365519: 0bc4787a656078f26de11c735bbcba7f13611897 365503: 6d2c682f982b2bdc5270c19d7e7d78015deb0fba v: v3 --- [refs] | 2 +- trunk/kernel/workqueue.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index dc9bf00e870b..523c7fa5bc6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c25a55daadc7e7058926f5728fba7721d824ffb +refs/heads/master: 87fc741e94cf64445c698486982b30afa0811eca diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c index d448edae3513..3ac2c4d85607 100644 --- a/trunk/kernel/workqueue.c +++ b/trunk/kernel/workqueue.c @@ -226,7 +226,7 @@ struct wq_device; * the appropriate worker_pool through its pool_workqueues. */ struct workqueue_struct { - unsigned int flags; /* PL: WQ_* flags */ + unsigned int flags; /* WQ: WQ_* flags */ struct pool_workqueue __percpu *cpu_pwqs; /* I: per-cpu pwq's */ struct list_head pwqs; /* WR: all pwqs of this wq */ struct list_head list; /* PL: list of all workqueues */ @@ -242,7 +242,7 @@ struct workqueue_struct { struct list_head maydays; /* MD: pwqs requesting rescue */ struct worker *rescuer; /* I: rescue worker */ - int nr_drainers; /* PL: drain in progress */ + int nr_drainers; /* WQ: drain in progress */ int saved_max_active; /* PW: saved pwq max_active */ #ifdef CONFIG_SYSFS @@ -2684,10 +2684,10 @@ void drain_workqueue(struct workqueue_struct *wq) * hotter than drain_workqueue() and already looks at @wq->flags. * Use __WQ_DRAINING so that queue doesn't have to check nr_drainers. */ - mutex_lock(&wq_pool_mutex); + mutex_lock(&wq->mutex); if (!wq->nr_drainers++) wq->flags |= __WQ_DRAINING; - mutex_unlock(&wq_pool_mutex); + mutex_unlock(&wq->mutex); reflush: flush_workqueue(wq); @@ -2714,10 +2714,10 @@ void drain_workqueue(struct workqueue_struct *wq) local_irq_enable(); - mutex_lock(&wq_pool_mutex); + mutex_lock(&wq->mutex); if (!--wq->nr_drainers) wq->flags &= ~__WQ_DRAINING; - mutex_unlock(&wq_pool_mutex); + mutex_unlock(&wq->mutex); } EXPORT_SYMBOL_GPL(drain_workqueue);