Skip to content

Commit

Permalink
workqueue: note the nested NOT_RUNNING test in worker_clr_flags() isn…
Browse files Browse the repository at this point in the history
…'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>
  • Loading branch information
Tejun Heo committed Jan 11, 2011
1 parent e159489 commit 42c025f
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion kernel/workqueue.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit 42c025f

Please sign in to comment.