aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@tv-sign.ru>2008-07-25 01:47:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 10:53:40 -0700
commita67da70dc0955580665f5444f318b92e69a3c272 (patch)
tree204164627e0fb6495516b24cca005845f492f600 /kernel
parent69b895fd13d73aebf62b75502eb6513d43057ba3 (diff)
downloadlinux-2.6.34-ux500-a67da70dc0955580665f5444f318b92e69a3c272.tar.gz
workqueues: lockdep annotations for flush_work()
Add lockdep annotations to flush_work() and update the comment. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Cc: Jarek Poplawski <jarkao2@o2.pl> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/workqueue.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 828e58230cb..4fcb75b9844 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -427,6 +427,8 @@ EXPORT_SYMBOL_GPL(flush_workqueue);
* flush_work - block until a work_struct's callback has terminated
* @work: the work which is to be flushed
*
+ * Returns false if @work has already terminated.
+ *
* It is expected that, prior to calling flush_work(), the caller has
* arranged for the work to not be requeued, otherwise it doesn't make
* sense to use this function.
@@ -442,6 +444,9 @@ int flush_work(struct work_struct *work)
if (!cwq)
return 0;
+ lock_acquire(&cwq->wq->lockdep_map, 0, 0, 0, 2, _THIS_IP_);
+ lock_release(&cwq->wq->lockdep_map, 1, _THIS_IP_);
+
prev = NULL;
spin_lock_irq(&cwq->lock);
if (!list_empty(&work->entry)) {