From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 17 Feb 2021 17:49:20 +0000 (+0100)
Subject: cgroups: don't overwrite type
X-Git-Tag: lxc-5.0.0~278^2~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c4348bd1c3b4ce2c44d255a41b2ad9da6b3c62c;p=thirdparty%2Flxc.git

cgroups: don't overwrite type

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 501d71a9f..bf8d4d67a 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -2016,18 +2016,8 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
 			wants_force_mount = true;
 	}
 
-	if (cgns_supported() && container_uses_namespace(handler, CLONE_NEWCGROUP)) {
+	if (cgns_supported() && container_uses_namespace(handler, CLONE_NEWCGROUP))
 		in_cgroup_ns = true;
-		/*
-		 * When cgroup namespaces are supported and used by the
-		 * container the LXC_AUTO_CGROUP_MIXED and
-		 * LXC_AUTO_CGROUP_FULL_MIXED auto mount options don't apply
-		 * since the parent directory of the container's cgroup is not
-		 * accessible to the container.
-		 */
-		cgroup_automount_type &= ~LXC_AUTO_CGROUP_MIXED;
-		cgroup_automount_type &= ~LXC_AUTO_CGROUP_FULL_MIXED;
-	}
 
 	if (in_cgroup_ns && !wants_force_mount)
 		return log_trace(true, "Mounting cgroups not requested or needed");