cgroups: use non-flag based checking now that we switched all codepaths over

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

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 275d781b9efe64b349f09789be11d453ccc7ae65..c2259bf5a78b9a69fe3537f8ac7cb73e72d81559 100644 (file)
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1772,7 +1772,16 @@ __cgfsng_ops static void cgfsng_payload_finalize(struct cgroup_ops *ops)
 /* cgroup-full:* is done, no need to create subdirs */
 static inline bool cg_mount_needs_subdirs(int cg_flags)
 {
-       return !(cg_flags >= LXC_AUTO_CGROUP_FULL_RO);
+       switch (cg_flags) {
+       case LXC_AUTO_CGROUP_RO:
+               return true;
+       case LXC_AUTO_CGROUP_RW:
+               return true;
+       case LXC_AUTO_CGROUP_MIXED:
+               return true;
+       }
+
+       return false;
 }
 
 /* After $rootfs/sys/fs/container/controller/the/cg/path has been created,
@@ -1787,7 +1796,7 @@ static int cg_legacy_mount_controllers(int cg_flags, struct hierarchy *h,
        int ret, remount_flags;
        int flags = MS_BIND;
 
-       if ((cg_flags & LXC_AUTO_CGROUP_RO) || (cg_flags & LXC_AUTO_CGROUP_MIXED)) {
+       if ((cg_flags == LXC_AUTO_CGROUP_RO) || (cg_flags == LXC_AUTO_CGROUP_MIXED)) {
                ret = mount(controllerpath, controllerpath, "cgroup", MS_BIND, NULL);
                if (ret < 0)
                        return log_error_errno(-1, errno, "Failed to bind mount \"%s\" onto \"%s\"",
@@ -1807,7 +1816,7 @@ static int cg_legacy_mount_controllers(int cg_flags, struct hierarchy *h,
 
        sourcepath = must_make_path(h->mountpoint, h->container_base_path,
                                    container_cgroup, NULL);
-       if ((cg_flags & LXC_AUTO_CGROUP_RO))
+       if (cg_flags == LXC_AUTO_CGROUP_RO)
                flags |= MS_RDONLY;
 
        ret = mount(sourcepath, cgpath, "cgroup", flags, NULL);
@@ -1852,8 +1861,8 @@ static int __cgroupfs_mount(int cg_flags, struct hierarchy *h,
        flags |= MOUNT_ATTR_NODEV;
        flags |= MOUNT_ATTR_RELATIME;
 
-       if ((cg_flags & LXC_AUTO_CGROUP_RO) ||
-           (cg_flags & LXC_AUTO_CGROUP_FULL_RO))
+       if ((cg_flags == LXC_AUTO_CGROUP_RO) ||
+           (cg_flags == LXC_AUTO_CGROUP_FULL_RO))
                flags |= MOUNT_ATTR_RDONLY;
 
        if (is_unified_hierarchy(h)) {
@@ -1921,9 +1930,16 @@ static inline int cgroupfs_bind_mount(int cg_flags, struct hierarchy *h,
                                      int dfd_mnt_cgroupfs,
                                      const char *hierarchy_mnt)
 {
-       if (!(cg_flags & LXC_AUTO_CGROUP_FULL_RO) &&
-           !(cg_flags & LXC_AUTO_CGROUP_FULL_MIXED))
+       switch (cg_flags) {
+       case LXC_AUTO_CGROUP_FULL_RO:
+               break;
+       case LXC_AUTO_CGROUP_FULL_RW:
+               break;
+       case LXC_AUTO_CGROUP_FULL_MIXED:
+               break;
+       default:
                return 0;
+       }
 
        return __cgroupfs_mount(cg_flags, h, rootfs, dfd_mnt_cgroupfs, hierarchy_mnt);
 }