X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=cgroup.c;h=565ce24ce18725159b9763d2e15f558cdbfb6f49;hp=f5c2592ce8276a0760afd4f916435074c0404a74;hb=c9106f61d0755dc6b8aa7c4252baa140c2d473f1;hpb=c3087ddb5805af3822d5005b8e014b5acf8ecd29 diff --git a/cgroup.c b/cgroup.c index f5c2592ce..565ce24ce 100644 --- a/cgroup.c +++ b/cgroup.c @@ -118,17 +118,15 @@ void cgroup_bonding_free(CGroupBonding *b) { hashmap_remove(b->unit->meta.manager->cgroup_bondings, b->path); } - free(b->controller); - free(b->path); - if (b->cgroup) { - - if (b->only_us && b->clean_up) - cgroup_delete_cgroup(b->cgroup, true); + if (b->only_us && b->clean_up && cgroup_bonding_is_empty(b) > 0) + cgroup_delete_cgroup_ext(b->cgroup, true); cgroup_free(&b->cgroup); } + free(b->controller); + free(b->path); free(b); }