chiark / gitweb /
cgroup: only delete empty cgroups
authorLennart Poettering <lennart@poettering.net>
Wed, 21 Apr 2010 01:15:58 +0000 (03:15 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 21 Apr 2010 01:15:58 +0000 (03:15 +0200)
cgroup.c

index f5c2592..565ce24 100644 (file)
--- 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);
 }