From 60c19ee812928bee2e09621047dc7d9bb2ca2c2c Mon Sep 17 00:00:00 2001 From: Lai Jiangshan Date: Thu, 7 Feb 2013 13:14:20 -0800 Subject: [PATCH] --- yaml --- r: 350299 b: refs/heads/master c: 54d5b7d079dffa74597715a892473b474babd5b5 h: refs/heads/master i: 350297: fce44b86b2e11e33b937e44c9ead2e48fbe3ce8a 350295: 4f9c2cfa2437df673058dccf44c7b4116f40e611 v: v3 --- [refs] | 2 +- trunk/kernel/workqueue.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ff32650873e2..3c5af8effeb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e19e397a85f33100bfa4210e256bec82fe22e167 +refs/heads/master: 54d5b7d079dffa74597715a892473b474babd5b5 diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c index 91ce7a984c22..1801c37b28c4 100644 --- a/trunk/kernel/workqueue.c +++ b/trunk/kernel/workqueue.c @@ -611,9 +611,13 @@ static struct worker_pool *get_work_pool(struct work_struct *work) */ static int get_work_pool_id(struct work_struct *work) { - struct worker_pool *pool = get_work_pool(work); + unsigned long data = atomic_long_read(&work->data); + + if (data & WORK_STRUCT_CWQ) + return ((struct cpu_workqueue_struct *) + (data & WORK_STRUCT_WQ_DATA_MASK))->pool->id; - return pool ? pool->id : WORK_OFFQ_POOL_NONE; + return data >> WORK_OFFQ_POOL_SHIFT; } static void mark_work_canceling(struct work_struct *work)