History

Convert 'alloc_obj' family to use the new default GFP_KERNEL argument

This was done entirely with mindless brute force, using git grep -l '\<k[vmz]*alloc_objs*(.*, GFP_KERNEL)' | xargs sed -i 's/\(alloc_objs*(.*\), GFP_KERNEL)/\1)/' to convert the new alloc_obj() users that had a simple GFP_KERNEL argument to just drop that argument. Note that due to the extreme simplicity of the scripting, any slightly more complex cases spread over multiple lines would not be triggered: they definitely exist, but this covers the vast bulk of the cases, and the resulting diff is also then easier to check automatically. For the same reason the 'flex' versions will be done as a separate conversion.

Linus Torvalds committed 8 months ago

Commit bf4afc51 parent e19e1b46673 files · +13013 −13013Browse files

Showing the changes to kernel/workqueue.c (1 of 6673 files). Show all

Unified · Split

kernel/workqueue.c+8−8
@@ -4714,7 +4714,7 @@ struct workqueue_attrs *alloc_workqueue_attrs_noprof(void) · 4713 unmodified lines
47144714 {
47154715 struct workqueue_attrs *attrs;
47164716
4717− attrs = kzalloc_obj(*attrs, GFP_KERNEL);
4717+ attrs = kzalloc_obj(*attrs);
47184718 if (!attrs)
47194719 goto fail;
47204720 if (!alloc_cpumask_var(&attrs->cpumask, GFP_KERNEL))
@@ -7486,7 +7486,7 @@ int workqueue_sysfs_register(struct workqueue_struct *wq) · 2765 unmodified lines
74867486 if (WARN_ON(wq->flags & __WQ_ORDERED))
74877487 return -EINVAL;
74887488
7489− wq->wq_dev = wq_dev = kzalloc_obj(*wq_dev, GFP_KERNEL);
7489+ wq->wq_dev = wq_dev = kzalloc_obj(*wq_dev);
74907490 if (!wq_dev)
74917491 return -ENOMEM;
74927492
@@ -7879,9 +7879,9 @@ void __init workqueue_init_early(void) · 386 unmodified lines
78797879 wq_power_efficient = true;
78807880
78817881 /* initialize WQ_AFFN_SYSTEM pods */
7882− pt->pod_cpus = kzalloc_objs(pt->pod_cpus[0], 1, GFP_KERNEL);
7883− pt->pod_node = kzalloc_objs(pt->pod_node[0], 1, GFP_KERNEL);
7884− pt->cpu_pod = kzalloc_objs(pt->cpu_pod[0], nr_cpu_ids, GFP_KERNEL);
7882+ pt->pod_cpus = kzalloc_objs(pt->pod_cpus[0], 1);
7883+ pt->pod_node = kzalloc_objs(pt->pod_node[0], 1);
7884+ pt->cpu_pod = kzalloc_objs(pt->cpu_pod[0], nr_cpu_ids);
78857885 BUG_ON(!pt->pod_cpus || !pt->pod_node || !pt->cpu_pod);
78867886
78877887 BUG_ON(!zalloc_cpumask_var_node(&pt->pod_cpus[0], GFP_KERNEL, NUMA_NO_NODE));
@@ -8063,7 +8063,7 @@ static void __init init_pod_type(struct wq_pod_type *pt, · 175 unmodified lines
80638063 pt->nr_pods = 0;
80648064
80658065 /* init @pt->cpu_pod[] according to @cpus_share_pod() */
8066− pt->cpu_pod = kzalloc_objs(pt->cpu_pod[0], nr_cpu_ids, GFP_KERNEL);
8066+ pt->cpu_pod = kzalloc_objs(pt->cpu_pod[0], nr_cpu_ids);
80678067 BUG_ON(!pt->cpu_pod);
80688068
80698069 for_each_possible_cpu(cur) {
@@ -8080,8 +8080,8 @@ static void __init init_pod_type(struct wq_pod_type *pt, · 10 unmodified lines
80808080 }
80818081
80828082 /* init the rest to match @pt->cpu_pod[] */
8083− pt->pod_cpus = kzalloc_objs(pt->pod_cpus[0], pt->nr_pods, GFP_KERNEL);
8084− pt->pod_node = kzalloc_objs(pt->pod_node[0], pt->nr_pods, GFP_KERNEL);
8083+ pt->pod_cpus = kzalloc_objs(pt->pod_cpus[0], pt->nr_pods);
8084+ pt->pod_node = kzalloc_objs(pt->pod_node[0], pt->nr_pods);
80858085 BUG_ON(!pt->pod_cpus || !pt->pod_node);
80868086
80878087 for (pod = 0; pod < pt->nr_pods; pod++)