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 501d71a9f7417531a09f0112df1388f985fc1df3..bf8d4d67a02ab21fcda43f5de2806e3b4007fb83 100644 (file)
--- 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");