workqueue: Make alloc/apply/free_workqueue_attrs() static
A message that is not in the archive (sent off-list or not yet received): [PATCH 0/2] Workqueeu code cleanup
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/2 workqueue: Make alloc/apply/free_workqueue_attrs() static
From: Thomas Gleixner <[email protected]>
None of those functions have any users outside of workqueue.c. Confine them.
Signed-off-by Thomas Gleixner <[email protected]>
Signed-off-by Sebastian Andrzej Siewior <[email protected]>
--- include/linux/workqueue.h | 4 ---- kernel/workqueue.c | 7 +++---- 2 files changed, 3 insertions(+), 8 deletions(-)
include/linux/workqueue.h +0 -4
@@ -435,10 +435,6 @@ struct workqueue_struct *alloc_workqueue(const char *fmt,extern void destroy_workqueue (struct workqueue_struct *wq); -struct workqueue_attrs *alloc_workqueue_attrs (gfp_t gfp_mask); -void free_workqueue_attrs (struct workqueue_attrs *attrs); -int apply_workqueue_attrs (struct workqueue_struct *wq, -const struct workqueue_attrs *attrs);int workqueue_set_unbound_cpumask (cpumask_var_t cpumask); extern bool queue_work_on(int cpu, struct workqueue_struct *wq,
kernel/workqueue.c +3 -4
@@ -3329,7 +3329,7 @@ EXPORT_SYMBOL_GPL(execute_in_process_context);* * Undo alloc_workqueue_attrs(). */ -void free_workqueue_attrs (struct workqueue_attrs *attrs) +static void free_workqueue_attrs (struct workqueue_attrs *attrs) {if (attrs) {free_cpumask_var (attrs->cpumask);
@@ -3346,7 +3346,7 @@ void free_workqueue_attrs(struct workqueue_attrs *attrs)* * Return: The allocated new workqueue_attr on success. %NULL on failure. */ -struct workqueue_attrs *alloc_workqueue_attrs (gfp_t gfp_mask) +static struct workqueue_attrs *alloc_workqueue_attrs (gfp_t gfp_mask) {struct workqueue_attrs *attrs;
@@ -4033,7 +4033,7 @@ static int apply_workqueue_attrs_locked(struct workqueue_struct *wq,* * Return: 0 on success and -errno on failure. */ -int apply_workqueue_attrs (struct workqueue_struct *wq, +static int apply_workqueue_attrs (struct workqueue_struct *wq,const struct workqueue_attrs *attrs) {int ret;
@@ -4044,7 +4044,6 @@ int apply_workqueue_attrs(struct workqueue_struct *wq,return ret; } -EXPORT_SYMBOL_GPL (apply_workqueue_attrs);/** * wq_update_unbound_numa - update NUMA affinity of a wq for CPU hot[un]plug
Signature · 1 line
2.20.1
PATCH 2/2 workqueue: Remove GPF argument from alloc_workqueue_attrs()
In reply to a message not in the archiveFrom: Thomas Gleixner <[email protected]>
All callers use GFP_KERNEL. No point in having that argument.
Signed-off-by Thomas Gleixner <[email protected]>
Signed-off-by Sebastian Andrzej Siewior <[email protected]>
--- kernel/workqueue.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
kernel/workqueue.c +11 -12
@@ -3339,21 +3339,20 @@ static void free_workqueue_attrs(struct workqueue_attrs *attrs)/** * alloc_workqueue_attrs - allocate a workqueue_attrs -* @gfp_mask: allocation mask to use * * Allocate a new workqueue_attrs, initialize with default settings and * return it. * * 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; - attrs =kzalloc (sizeof (*attrs), gfp_mask); + attrs =kzalloc (sizeof (*attrs),GFP_KERNEL );if (!attrs) goto fail; -if (!alloc_cpumask_var (&attrs->cpumask, gfp_mask)) +if (!alloc_cpumask_var (&attrs->cpumask,GFP_KERNEL )) goto fail;cpumask_copy (attrs->cpumask, cpu_possible_mask);
@@ -3431,7 +3430,7 @@ static int init_worker_pool(struct worker_pool *pool) pool->refcnt =1 ;/* shouldn't fail above this point */ - pool->attrs =alloc_workqueue_attrs (GFP_KERNEL ); + pool->attrs =alloc_workqueue_attrs ();if (!pool->attrs)return -ENOMEM ;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 ); - new_attrs =alloc_workqueue_attrs (GFP_KERNEL ); - tmp_attrs =alloc_workqueue_attrs (GFP_KERNEL ); + new_attrs =alloc_workqueue_attrs (); + tmp_attrs =alloc_workqueue_attrs ();if (!ctx || !new_attrs || !tmp_attrs) goto out_free;
@@ -4241,7 +4240,7 @@ struct workqueue_struct *alloc_workqueue(const char *fmt,return NULL ;if (flags &WQ_UNBOUND ) { - wq->unbound_attrs =alloc_workqueue_attrs (GFP_KERNEL ); + wq->unbound_attrs =alloc_workqueue_attrs ();if (!wq->unbound_attrs) 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); - attrs =alloc_workqueue_attrs (GFP_KERNEL ); + attrs =alloc_workqueue_attrs ();if (!attrs)return NULL ;
@@ -5816,7 +5815,7 @@ static void __init wq_numa_init(void)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);/*
@@ -5891,7 +5890,7 @@ int __init workqueue_init_early(void)for (i =0 ; i <NR_STD_WORKER_POOLS ; i++) {struct workqueue_attrs *attrs; -BUG_ON (!(attrs =alloc_workqueue_attrs (GFP_KERNEL ))); +BUG_ON (!(attrs =alloc_workqueue_attrs ())); attrs->nice = std_nice[i]; 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. * 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->no_numa = true; ordered_wq_attrs[i] = attrs;
Signature · 1 line
2.20.1
Tejun Heo
maintainerRe: your mail
In reply to a message not in the archiveQuoted 1 line · Sebastian Andrzej Siewior
A small series of tiny cleanups.
Applied 1-2 to wq/for-5.3.
Thanks.
Signature · 1 line
tejun