cgroups: don't strip LXC_AUTO_CGROUP_FORCE

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

cgroups: don't strip LXC_AUTO_CGROUP_FORCE
68599aab · Christian Brauner · cdd3b77d · 68599aab
Unverified Commit 68599aab authored Feb 15, 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
@@ -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);