Fix "delayed_work_pending()" macro expansion
authorLinus Torvalds <torvalds@woody.osdl.org>
Fri, 15 Dec 2006 22:13:51 +0000 (14:13 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Fri, 15 Dec 2006 22:13:51 +0000 (14:13 -0800)
Nobody uses it, but it was still wrong.  Using the macro argument name
'work' meant that when we used 'work' as a member name, that would also
get replaced by the macro argument.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
include/linux/workqueue.h

index edef8d5..5b13dcf 100644 (file)
@@ -121,8 +121,8 @@ struct execute_work {
  * pending
  * @work: The work item in question
  */
-#define delayed_work_pending(work) \
-       test_bit(WORK_STRUCT_PENDING, &(work)->work.management)
+#define delayed_work_pending(w) \
+       work_pending(&(w)->work)
 
 /**
  * work_release - Release a work item under execution