From: Pavel Hrdina <phrdina@redhat.com>
Date: Sun, 19 Aug 2018 09:04:52 +0000 (+0200)
Subject: vircgroup: Simplify if conditions in virCgroupMakeGroup
X-Git-Tag: v4.7.0-rc1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ec8416f04460f3bbf7907231b28028c3daed7e7;p=thirdparty%2Flibvirt.git

vircgroup: Simplify if conditions in virCgroupMakeGroup

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index dde9ed21a2..02de33f74f 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -1079,24 +1079,20 @@ virCgroupMakeGroup(virCgroupPtr parent,
                     goto error;
                 }
             }
-            if (group->controllers[VIR_CGROUP_CONTROLLER_CPUSET].mountPoint != NULL &&
-                (i == VIR_CGROUP_CONTROLLER_CPUSET ||
-                 STREQ(group->controllers[i].mountPoint,
-                       group->controllers[VIR_CGROUP_CONTROLLER_CPUSET].mountPoint))) {
-                if (virCgroupCpuSetInherit(parent, group) < 0)
-                    goto error;
+            if (i == VIR_CGROUP_CONTROLLER_CPUSET &&
+                group->controllers[i].mountPoint != NULL &&
+                virCgroupCpuSetInherit(parent, group) < 0) {
+                goto error;
             }
             /*
              * Note that virCgroupSetMemoryUseHierarchy should always be
              * called prior to creating subcgroups and attaching tasks.
              */
             if ((flags & VIR_CGROUP_MEM_HIERACHY) &&
-                (group->controllers[VIR_CGROUP_CONTROLLER_MEMORY].mountPoint != NULL) &&
-                (i == VIR_CGROUP_CONTROLLER_MEMORY ||
-                 STREQ(group->controllers[i].mountPoint,
-                       group->controllers[VIR_CGROUP_CONTROLLER_MEMORY].mountPoint))) {
-                if (virCgroupSetMemoryUseHierarchy(group) < 0)
-                    goto error;
+                i == VIR_CGROUP_CONTROLLER_MEMORY &&
+                group->controllers[i].mountPoint != NULL &&
+                virCgroupSetMemoryUseHierarchy(group) < 0) {
+                goto error;
             }
         }
     }