]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
cpuset: remove dead code in cpuset-v1.c
authorChen Ridong <chenridong@huawei.com>
Sat, 20 Dec 2025 10:15:57 +0000 (10:15 +0000)
committerTejun Heo <tj@kernel.org>
Tue, 23 Dec 2025 03:40:17 +0000 (17:40 -1000)
The commit 6e1d31ce495c ("cpuset: separate generate_sched_domains for v1
and v2") introduced dead code that was originally added for cpuset-v2
partition domain generation. Remove the redundant root_load_balance check.

Fixes: 6e1d31ce495c ("cpuset: separate generate_sched_domains for v1 and v2")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/cgroups/9a442808-ed53-4657-988b-882cc0014c0d@huaweicloud.com/T/
Signed-off-by: Chen Ridong <chenridong@huawei.com>
Reviewed-by: Waiman Long <longman@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
kernel/cgroup/cpuset-v1.c

index 7303315fdba79656383754aef0113fbc2c0bec4c..ecfea7800f0dcffecca26f8eb1ee261d767bbe66 100644 (file)
@@ -605,7 +605,6 @@ int cpuset1_generate_sched_domains(cpumask_var_t **domains,
        int ndoms = 0;          /* number of sched domains in result */
        int nslot;              /* next empty doms[] struct cpumask slot */
        struct cgroup_subsys_state *pos_css;
-       bool root_load_balance = is_sched_load_balance(&top_cpuset);
        int nslot_update;
 
        lockdep_assert_cpuset_lock_held();
@@ -615,7 +614,7 @@ int cpuset1_generate_sched_domains(cpumask_var_t **domains,
        csa = NULL;
 
        /* Special case for the 99% of systems with one, full, sched domain */
-       if (root_load_balance) {
+       if (is_sched_load_balance(&top_cpuset)) {
                ndoms = 1;
                doms = alloc_sched_domains(ndoms);
                if (!doms)
@@ -638,8 +637,6 @@ int cpuset1_generate_sched_domains(cpumask_var_t **domains,
        csn = 0;
 
        rcu_read_lock();
-       if (root_load_balance)
-               csa[csn++] = &top_cpuset;
        cpuset_for_each_descendant_pre(cp, pos_css, &top_cpuset) {
                if (cp == &top_cpuset)
                        continue;