From e3a4724db2fca3e0269e44dccb4c3ec692fb1943 Mon Sep 17 00:00:00 2001
From: jiangchuangang <jiangchuangang@huawei.com>
Date: Mon, 22 Aug 2022 11:13:51 +0800
Subject: [PATCH] take jointly mounted controllers into account when migrate
 cgroups, otherwise "CGroupMask done" seems to be redundant.

---
 src/shared/cgroup-setup.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c
index c3bf7348ff..2ea83f05d3 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;