summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChen Ridong <chenridong@huawei.com>2026-01-14 04:51:29 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2026-02-19 18:28:26 +0300
commit6e5eccdef67ee879d7c0474c7e19e8b683f27dbe (patch)
treeee1255166472e33e9e94da9671e5f5dd520da806
parentff37dd18ce7739a26aab0cc2d31006a45e6bde63 (diff)
downloadlinux-6e5eccdef67ee879d7c0474c7e19e8b683f27dbe.tar.xz
cpuset: Fix missing adaptation for cpuset_is_populated
Commit b1bcaed1e39a ("cpuset: Treat cpusets in attaching as populated") was backported to the long‑term support (LTS) branches. However, because commit d5cf4d34a333 ("cgroup/cpuset: Don't track # of local child partitions") was not backported, a corresponding adaptation to the backported code is still required. To ensure correct behavior, replace cgroup_is_populated with cpuset_is_populated in the partition_is_populated function. Cc: stable@vger.kernel.org # 6.1+ Fixes: b1bcaed1e39a ("cpuset: Treat cpusets in attaching as populated") Cc: Waiman Long <longman@redhat.com> Cc: Tejun Heo <tj@kernel.org> Signed-off-by: Chen Ridong <chenridong@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--kernel/cgroup/cpuset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index f61dde0497f3..3c466e742751 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -486,7 +486,7 @@ static inline bool partition_is_populated(struct cpuset *cs,
cs->attach_in_progress)
return true;
if (!excluded_child && !cs->nr_subparts_cpus)
- return cgroup_is_populated(cs->css.cgroup);
+ return cpuset_is_populated(cs);
rcu_read_lock();
cpuset_for_each_descendant_pre(cp, pos_css, cs) {