From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Mon, 15 Feb 2021 12:25:00 +0000 (+0100)
Subject: cgroups: don't strip LXC_AUTO_CGROUP_FORCE
X-Git-Tag: lxc-5.0.0~287^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68599aab1055b27f3c29246f93c24ee32db44436;p=thirdparty%2Flxc.git

cgroups: don't strip LXC_AUTO_CGROUP_FORCE

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

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 8b15db177..523283452 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1889,10 +1889,8 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
 	if ((cg_flags & LXC_AUTO_CGROUP_MASK) == 0)
 		return true;
 
-	if (cg_flags & LXC_AUTO_CGROUP_FORCE) {
-		cg_flags &= ~LXC_AUTO_CGROUP_FORCE;
+	if (cg_flags & LXC_AUTO_CGROUP_FORCE)
 		wants_force_mount = true;
-	}
 
 	if (!wants_force_mount) {
 		wants_force_mount = !lxc_wants_cap(CAP_SYS_ADMIN, conf);