Add lockdep annotations to flush_work() and update the comment.
Showing the changes to kernel/workqueue.c (1 of 1 file). Show all
Unified · Split
| @@ -427,6 +427,8 @@ EXPORT_SYMBOL_GPL(flush_workqueue); · 426 unmodified lines | |||
| 427 | * flush_work - block until a work_struct's callback has terminated | 427 | * flush_work - block until a work_struct's callback has terminated |
| 428 | * @work: the work which is to be flushed | 428 | * @work: the work which is to be flushed |
| 429 | * | 429 | * |
| 430 | * Returns false if @work has already terminated. | ||
| 431 | * | ||
| 430 | * It is expected that, prior to calling flush_work(), the caller has | 432 | * It is expected that, prior to calling flush_work(), the caller has |
| 431 | * arranged for the work to not be requeued, otherwise it doesn't make | 433 | * arranged for the work to not be requeued, otherwise it doesn't make |
| 432 | * sense to use this function. | 434 | * sense to use this function. |
| @@ -442,6 +444,9 @@ int flush_work(struct work_struct *work) · 9 unmodified lines | |||
| 442 | if (!cwq) | 444 | if (!cwq) |
| 443 | return 0; | 445 | return 0; |
| 444 | 446 | ||
| 447 | lock_acquire(&cwq->wq->lockdep_map, 0, 0, 0, 2, _THIS_IP_); | ||
| 448 | lock_release(&cwq->wq->lockdep_map, 1, _THIS_IP_); | ||
| 449 | |||
| 445 | prev = NULL; | 450 | prev = NULL; |
| 446 | spin_lock_irq(&cwq->lock); | 451 | spin_lock_irq(&cwq->lock); |
| 447 | if (!list_empty(&work->entry)) { | 452 | if (!list_empty(&work->entry)) { |