Skip to contentSkip to conversation

workqueue: annotate lock context change

PATCH Applied Namhyung Kim 2 participants 2 messages Aug 22, 2010 – Aug 23, 2010 Workqueue

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 workqueue: annotate lock context change

Some of internal functions called within gcwq->lock context releases and regrabs the lock but were missing proper annotations. Add it.

---
 kernel/workqueue.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
kernel/workqueue.c +6 -0
index 2994a0e..be0b71d 100644
@@ -1485,6 +1485,8 @@ static void gcwq_mayday_timeout(unsigned long __gcwq)
  * otherwise.
  */
 static bool maybe_create_worker(struct global_cwq *gcwq)
+__releases(&gcwq->lock)
+__acquires(&gcwq->lock)
 {
 	if (!need_to_create_worker(gcwq))
 		return false;
@@ -1722,6 +1724,8 @@ static void cwq_dec_nr_in_flight(struct cpu_workqueue_struct *cwq, int color)
  * spin_lock_irq(gcwq->lock) which is released and regrabbed.
  */
 static void process_one_work(struct worker *worker, struct work_struct *work)
+__releases(&gcwq->lock)
+__acquires(&gcwq->lock)
 {
 	struct cpu_workqueue_struct *cwq = get_work_cwq(work);
 	struct global_cwq *gcwq = cwq->gcwq;
@@ -3230,6 +3234,8 @@ static int __cpuinit trustee_thread(void *__gcwq)
  * multiple times.  To be used by cpu_callback.
  */
 static void __cpuinit wait_trustee_state(struct global_cwq *gcwq, int state)
+__releases(&gcwq->lock)
+__acquires(&gcwq->lock)
 {
 	if (!(gcwq->trustee_state == state ||
 	      gcwq->trustee_state == TRUSTEE_DONE)) {
Signature · 1 line
1.7.0.4
maintainer Applied
#1 lore raw
Quoted 4 lines · Namhyung Kim

Some of internal functions called within gcwq->lock context releases and regrabs the lock but were missing proper annotations. Add it.

applied to wq#for-linus. Thanks.

Signature · 1 line
tejun