diff options
author | Lennart Poettering <lennart@poettering.net> | 2010-06-16 05:07:30 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2010-06-16 05:07:30 +0200 |
commit | 5515116b61d23c5ddb1c5ac74adfaf564b28be76 (patch) | |
tree | 73d15889ec563015aed825ca4f5d658bb692f6ae /src | |
parent | 41192f6e8af0004c5d736df31c25b849e34e7ac6 (diff) |
cgroup: drop inherit flag, this mus be fixed in the kernel
Diffstat (limited to 'src')
-rw-r--r-- | src/cgroup.c | 7 | ||||
-rw-r--r-- | src/cgroup.h | 3 |
2 files changed, 1 insertions, 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); |