cgroups: don't move pivot cgroup under the monitor's cgroup

Otherwise we will never be able to destroy the monitor's cgroup. Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

cgroups: don't move pivot cgroup under the monitor's cgroup
699919e6 · Christian Brauner · 14637407 · 699919e6
Unverified Commit 699919e6 authored Feb 17, 2021 by Christian Brauner
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

cgfsng.c src/lxc/cgroups/cgfsng.c +1 -3

No files found.
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1247,9 +1247,7 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
 			goto cgroup_prune_tree;
 		}
-		if (conf->cgroup_meta.monitor_dir)
+		if (conf->cgroup_meta.dir)
-			pivot_path = must_make_path(conf->cgroup_meta.monitor_dir, CGROUP_PIVOT, NULL);
-		else if (conf->cgroup_meta.dir)
 			pivot_path = must_make_path(conf->cgroup_meta.dir, CGROUP_PIVOT, NULL);
 		else
 			pivot_path = must_make_path(CGROUP_PIVOT, NULL);