Merge pull request #2688 from brauner/2018-10-10/cgfsng_fix_monitor_cpuset_deletion

src/lxc/cgroups/cgfsng.c

@@ -1153,6 +1153,7 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
 	for (int i = 0; ops->hierarchies[i]; i++) {
 		int ret;
 		char *chop;
+		char pivot_cgroup[] = PIVOT_CGROUP;
 		struct hierarchy *h = ops->hierarchies[i];
 
 		if (!h->monitor_full_path)
@@ -1174,6 +1175,15 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
 		if (chop)
 			*chop = '\0';
 
+		/*
+		 * Make sure not to pass in the ro string literal PIVOT_CGROUP
+		 * here.
+		 */
+		if (!cg_legacy_handle_cpuset_hierarchy(h, pivot_cgroup)) {
+			WARN("Failed to handle legacy cpuset controller");
+			goto next;
+		}
+
 		ret = mkdir_p(pivot_path, 0755);
 		if (ret < 0 && errno != EEXIST) {
 			SYSWARN("Failed to create cgroup \"%s\"\n", pivot_path);