Commit 269679bd authored by Chen Ridong's avatar Chen Ridong Committed by Tejun Heo
Browse files

cpuset: remove dead code in cpuset-v1.c 



The commit 6e1d31ce ("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: 6e1d31ce ("cpuset: separate generate_sched_domains for v1 and v2")
Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/cgroups/9a442808-ed53-4657-988b-882cc0014c0d@huaweicloud.com/T/


Signed-off-by: default avatarChen Ridong <chenridong@huawei.com>
Reviewed-by: default avatarWaiman Long <longman@redhat.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 7cc17205

kernel/cgroup/cpuset-v1.c

+1 −4
Original line number Diff line number Diff line
@@ -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;