From 5515116b61d23c5ddb1c5ac74adfaf564b28be76 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 16 Jun 2010 05:07:30 +0200
Subject: cgroup: drop inherit flag, this mus be fixed in the kernel

---
 src/cgroup.c | 7 +------
 src/cgroup.h | 3 ---
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/cgroup.c b/src/cgroup.c
index fb4047f215..330014dc9f 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 d27c063c12..26fac0a660 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);
-- 
cgit v1.2.3-54-g00ecf