diff options
| author |   Tejun Heo <tj@kernel.org> | 2011-01-11 15:58:49 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-01-11 16:03:14 +0100 |
| commit | 42c025f3de9042d9c9abd9a6f6205d1a0f4bcadf (patch) | |
| tree | 67c618a227059548e2be915560aa113f590e6d5e /kernel/workqueue.c | |
| parent | workqueue: relax lockdep annotation on flush_work() (diff) | |
| download | linux-dev-42c025f3de9042d9c9abd9a6f6205d1a0f4bcadf.tar.xz linux-dev-42c025f3de9042d9c9abd9a6f6205d1a0f4bcadf.zip | |
workqueue: note the nested NOT_RUNNING test in worker_clr_flags() isn't a noop
The nested NOT_RUNNING test in worker_clr_flags() is slightly
misleading in that if NOT_RUNNING were a single flag the nested test
would be always %true and thus noop. Add a comment noting that the
test isn't a noop.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Hillf Danton <dhillf@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 930c2390b77e..11869faa6819 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -768,7 +768,11 @@ static inline void worker_clr_flags(struct worker *worker, unsigned int flags) worker->flags &= ~flags; - /* if transitioning out of NOT_RUNNING, increment nr_running */ + /* + * If transitioning out of NOT_RUNNING, increment nr_running. Note + * that the nested NOT_RUNNING is not a noop. NOT_RUNNING is mask + * of multiple flags, not a single flag. + */ if ((flags & WORKER_NOT_RUNNING) && (oflags & WORKER_NOT_RUNNING)) if (!(worker->flags & WORKER_NOT_RUNNING)) atomic_inc(get_gcwq_nr_running(gcwq->cpu)); |