From: jiangchuangang <jiangchuangang@huawei.com>
Date: Mon, 22 Aug 2022 03:13:51 +0000 (+0800)
Subject: take jointly mounted controllers into account when migrate cgroups, otherwise "CGroup... 
X-Git-Tag: v252-rc1~390
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3a4724db2fca3e0269e44dccb4c3ec692fb1943;p=thirdparty%2Fsystemd.git

take jointly mounted controllers into account when migrate cgroups, otherwise "CGroupMask done" seems to be redundant.
---

diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c
index c3bf7348ffe..2ea83f05d31 100644
--- a/src/shared/cgroup-setup.c
+++ b/src/shared/cgroup-setup.c
@@ -768,6 +768,8 @@ int cg_migrate_v1_controllers(CGroupMask supported, CGroupMask mask, const char
                 /* Remember first error and try continuing */
                 q = cg_migrate_recursive_fallback(SYSTEMD_CGROUP_CONTROLLER, from, cgroup_controller_to_string(c), to, 0);
                 r = (r < 0) ? r : q;
+
+                done |= CGROUP_MASK_EXTEND_JOINED(bit);
         }
 
         return r;