From: Lai Jiangshan Date: Thu, 10 Jul 2014 16:11:13 +0000 (+0800) Subject: workqueue: reuse the already calculated pwq in try_to_grab_pending() X-Git-Tag: v3.17-rc1~149^2~11 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9c34a7042e6fe79b900bd44db03dde8a4ecdf6f6;p=karo-tx-linux.git workqueue: reuse the already calculated pwq in try_to_grab_pending() try_to_grab_pending() was re-calculating the associated pwq using get_work_pwq() when it already has it cached in a local varible and the association can't change. Reuse the local variable instead. This doesn't introduce any functional changes. tj: Updated description. Signed-off-by: Lai Jiangshan Signed-off-by: Tejun Heo --- diff --git a/kernel/workqueue.c b/kernel/workqueue.c index f344334f5690..338d418ba6aa 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1225,7 +1225,7 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork, pwq_activate_delayed_work(work); list_del_init(&work->entry); - pwq_dec_nr_in_flight(get_work_pwq(work), get_work_color(work)); + pwq_dec_nr_in_flight(pwq, get_work_color(work)); /* work->data points to pwq iff queued, point to pool */ set_work_pool_and_keep_pending(work, pool->id);