p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

workqueue: Remove GPF argument from alloc_workqueue_attrs() 

All callers use GFP_KERNEL. No point in having that argument.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Thomas Gleixner 2019-06-26 16:52:38 +02:00 committed by Tejun Heo
parent 2c9858ecbe
commit be69d00d97
1 changed files with 11 additions and 12 deletions

23
kernel/workqueue.c
View File

@ -3339,21 +3339,20 @@ static void free_workqueue_attrs(struct workqueue_attrs *attrs)
/** /**
* alloc_workqueue_attrs - allocate a workqueue_attrs * alloc_workqueue_attrs - allocate a workqueue_attrs
* @gfp_mask: allocation mask to use
* *
* Allocate a new workqueue_attrs, initialize with default settings and * Allocate a new workqueue_attrs, initialize with default settings and
* return it. * return it.
* *
* Return: The allocated new workqueue_attr on success. %NULL on failure. * Return: The allocated new workqueue_attr on success. %NULL on failure.
*/ */
static struct workqueue_attrs *alloc_workqueue_attrs(gfp_t gfp_mask) static struct workqueue_attrs *alloc_workqueue_attrs(void)
{ {
struct workqueue_attrs *attrs; struct workqueue_attrs *attrs;
attrs = kzalloc(sizeof(*attrs), gfp_mask); attrs = kzalloc(sizeof(*attrs), GFP_KERNEL);
if (!attrs) if (!attrs)
goto fail; goto fail;
if (!alloc_cpumask_var(&attrs->cpumask, gfp_mask)) if (!alloc_cpumask_var(&attrs->cpumask, GFP_KERNEL))
goto fail; goto fail;
cpumask_copy(attrs->cpumask, cpu_possible_mask); cpumask_copy(attrs->cpumask, cpu_possible_mask);
@ -3431,7 +3430,7 @@ static int init_worker_pool(struct worker_pool *pool)
pool->refcnt = 1; pool->refcnt = 1;
/* shouldn't fail above this point */ /* shouldn't fail above this point */
pool->attrs = alloc_workqueue_attrs(GFP_KERNEL); pool->attrs = alloc_workqueue_attrs();
if (!pool->attrs) if (!pool->attrs)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
@ -3896,8 +3895,8 @@ apply_wqattrs_prepare(struct workqueue_struct *wq,
ctx = kzalloc(struct_size(ctx, pwq_tbl, nr_node_ids), GFP_KERNEL); ctx = kzalloc(struct_size(ctx, pwq_tbl, nr_node_ids), GFP_KERNEL);
new_attrs = alloc_workqueue_attrs(GFP_KERNEL); new_attrs = alloc_workqueue_attrs();
tmp_attrs = alloc_workqueue_attrs(GFP_KERNEL); tmp_attrs = alloc_workqueue_attrs();
if (!ctx || !new_attrs || !tmp_attrs) if (!ctx || !new_attrs || !tmp_attrs)
goto out_free; goto out_free;
@ -4241,7 +4240,7 @@ struct workqueue_struct *alloc_workqueue(const char *fmt,
return NULL; return NULL;
if (flags & WQ_UNBOUND) { if (flags & WQ_UNBOUND) {
wq->unbound_attrs = alloc_workqueue_attrs(GFP_KERNEL); wq->unbound_attrs = alloc_workqueue_attrs();
if (!wq->unbound_attrs) if (!wq->unbound_attrs)
goto err_free_wq; goto err_free_wq;
} }
@ -5394,7 +5393,7 @@ static struct workqueue_attrs *wq_sysfs_prep_attrs(struct workqueue_struct *wq)
lockdep_assert_held(&wq_pool_mutex); lockdep_assert_held(&wq_pool_mutex);
attrs = alloc_workqueue_attrs(GFP_KERNEL); attrs = alloc_workqueue_attrs();
if (!attrs) if (!attrs)
return NULL; return NULL;
@ -5816,7 +5815,7 @@ static void __init wq_numa_init(void)
return; return;
} }
wq_update_unbound_numa_attrs_buf = alloc_workqueue_attrs(GFP_KERNEL); wq_update_unbound_numa_attrs_buf = alloc_workqueue_attrs();
BUG_ON(!wq_update_unbound_numa_attrs_buf); BUG_ON(!wq_update_unbound_numa_attrs_buf);
/* /*
@ -5891,7 +5890,7 @@ int __init workqueue_init_early(void)
for (i = 0; i < NR_STD_WORKER_POOLS; i++) { for (i = 0; i < NR_STD_WORKER_POOLS; i++) {
struct workqueue_attrs *attrs; struct workqueue_attrs *attrs;
BUG_ON(!(attrs = alloc_workqueue_attrs(GFP_KERNEL))); BUG_ON(!(attrs = alloc_workqueue_attrs()));
attrs->nice = std_nice[i]; attrs->nice = std_nice[i];
unbound_std_wq_attrs[i] = attrs; unbound_std_wq_attrs[i] = attrs;
@ -5900,7 +5899,7 @@ int __init workqueue_init_early(void)
* guaranteed by max_active which is enforced by pwqs. * guaranteed by max_active which is enforced by pwqs.
* Turn off NUMA so that dfl_pwq is used for all nodes. * Turn off NUMA so that dfl_pwq is used for all nodes.
*/ */
BUG_ON(!(attrs = alloc_workqueue_attrs(GFP_KERNEL))); BUG_ON(!(attrs = alloc_workqueue_attrs()));
attrs->nice = std_nice[i]; attrs->nice = std_nice[i];
attrs->no_numa = true; attrs->no_numa = true;
ordered_wq_attrs[i] = attrs; ordered_wq_attrs[i] = attrs;