diff options
| author | jiangchuangang <jiangchuangang@huawei.com> | 2022-08-22 05:13:51 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-08-22 07:21:31 +0200 |
| commit | e3a4724db2fca3e0269e44dccb4c3ec692fb1943 (patch) | |
| tree | 1484ed010c0d3d26b33802d8402890f51f9db2ce | |
| parent | Merge pull request #24379 from mrc0mmand/llvm-15 (diff) | |
| download | systemd-e3a4724db2fca3e0269e44dccb4c3ec692fb1943.tar.xz systemd-e3a4724db2fca3e0269e44dccb4c3ec692fb1943.zip | |
take jointly mounted controllers into account when migrate cgroups, otherwise "CGroupMask done" seems to be redundant.
| -rw-r--r-- | src/shared/cgroup-setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; |