[PATCH 2/3] workqueues: microoptimize set_wq_data()

[Oleg Nesterov <oleg@redhat.com>]

The comment correctly states that the _PENDING bit must be set and
we even have the BUG_ON() check. But this means there is no need to
set WORK_STRUCT_PENDING explicitely and load work_data_bits() twice,
we can rely on WORK_STRUCT_FLAG_MASK which contains _PENDING.

Shaves 32 bytes from workqueue.o.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---

 kernel/workqueue.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

--- wq/kernel/workqueue.c~2_CLEANUP_SET_DATA	2010-02-24 20:55:53.000000000 +0100
+++ wq/kernel/workqueue.c	2010-02-24 20:58:37.000000000 +0100
@@ -220,12 +220,9 @@ struct cpu_workqueue_struct *wq_per_cpu(
 static inline void set_wq_data(struct work_struct *work,
 				struct cpu_workqueue_struct *cwq)
 {
-	unsigned long new;
-
-	BUG_ON(!work_pending(work));
-
-	new = (unsigned long) cwq | (1UL << WORK_STRUCT_PENDING);
+	unsigned long new = (unsigned long)cwq;
 	new |= WORK_STRUCT_FLAG_MASK & *work_data_bits(work);
+	BUG_ON(!(new & (1UL << WORK_STRUCT_PENDING)));
 	atomic_long_set(&work->data, new);
 }