From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 16 Jun 2010 03:07:30 +0000 (+0200)
Subject: cgroup: drop inherit flag, this mus be fixed in the kernel
X-Git-Tag: v1~189
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=5515116b61d23c5ddb1c5ac74adfaf564b28be76;hp=41192f6e8af0004c5d736df31c25b849e34e7ac6

cgroup: drop inherit flag, this mus be fixed in the kernel
---

diff --git a/src/cgroup.c b/src/cgroup.c
index fb4047f21..330014dc9 100644
--- a/src/cgroup.c
+++ b/src/cgroup.c
@@ -70,12 +70,7 @@ int cgroup_bonding_realize(CGroupBonding *b) {
                 goto fail;
         }
 
-        if (b->inherit)
-                r = cgroup_create_cgroup_from_parent(b->cgroup, true);
-        else
-                r = cgroup_create_cgroup(b->cgroup, true);
-
-        if (r != 0) {
+        if ((r = cgroup_create_cgroup(b->cgroup, true)) != 0) {
                 r = translate_error(r, errno);
                 goto fail;
         }
diff --git a/src/cgroup.h b/src/cgroup.h
index d27c063c1..26fac0a66 100644
--- a/src/cgroup.h
+++ b/src/cgroup.h
@@ -48,9 +48,6 @@ struct CGroupBonding {
 
         /* When our tasks are the only ones in this group */
         bool only_us:1;
-
-        /* Inherit parameters from parent group */
-        bool inherit:1;
 };
 
 int cgroup_bonding_realize(CGroupBonding *b);