iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workqueue: remove worker_pool->gcwq

Browse Source 
The only remaining user of pool->gcwq is std_worker_pool_pri().
Reimplement it using get_gcwq() and remove worker_pool->gcwq.

This is part of an effort to remove global_cwq and make worker_pool
the top level abstraction, which in turn will help implementing worker
pools with user-specified attributes.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Lai Jiangshan <laijs@cn.fujitsu.com>
This commit is contained in:
Tejun Heo 2013-01-24 11:01:34 -08:00
parent 38db41d984
commit 4e8f0a6096
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/workqueue.c
View File

@ -123,7 +123,6 @@ enum {
/* struct worker is defined in workqueue_internal.h */ /* struct worker is defined in workqueue_internal.h */
struct worker_pool { struct worker_pool {
struct global_cwq *gcwq; /* I: the owning gcwq */
spinlock_t lock; /* the pool lock */ spinlock_t lock; /* the pool lock */
unsigned int cpu; /* I: the associated cpu */ unsigned int cpu; /* I: the associated cpu */
int id; /* I: pool ID */ int id; /* I: pool ID */
@ -451,11 +450,6 @@ static DEFINE_IDR(worker_pool_idr);
static int worker_thread(void *__worker); static int worker_thread(void *__worker);
static int std_worker_pool_pri(struct worker_pool *pool)
{
return pool - pool->gcwq->pools;
}
static struct global_cwq *get_gcwq(unsigned int cpu) static struct global_cwq *get_gcwq(unsigned int cpu)
{ {
if (cpu != WORK_CPU_UNBOUND) if (cpu != WORK_CPU_UNBOUND)
@ -464,6 +458,11 @@ static struct global_cwq *get_gcwq(unsigned int cpu)
return &unbound_global_cwq; return &unbound_global_cwq;
} }
static int std_worker_pool_pri(struct worker_pool *pool)
{
return pool - get_gcwq(pool->cpu)->pools;
}
/* allocate ID and assign it to @pool */ /* allocate ID and assign it to @pool */
static int worker_pool_assign_id(struct worker_pool *pool) static int worker_pool_assign_id(struct worker_pool *pool)
{ {
@ -3818,7 +3817,6 @@ static int __init init_workqueues(void)
struct worker_pool *pool; struct worker_pool *pool;
for_each_std_worker_pool(pool, cpu) { for_each_std_worker_pool(pool, cpu) {
pool->gcwq = get_gcwq(cpu);
spin_lock_init(&pool->lock); spin_lock_init(&pool->lock);
pool->cpu = cpu; pool->cpu = cpu;
pool->flags |= POOL_DISASSOCIATED; pool->flags |= POOL_DISASSOCIATED;