chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8aec412
)
core: don't consider a unit's cgroup empty if only a subcgroup runs empty
author
Lennart Poettering
<lennart@poettering.net>
Tue, 2 Jul 2013 14:24:13 +0000
(16:24 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 2 Jul 2013 14:24:13 +0000
(16:24 +0200)
src/core/cgroup.c
patch
|
blob
|
history
diff --git
a/src/core/cgroup.c
b/src/core/cgroup.c
index cdccf3ff152411167620cf1eee79d65ffe6fac82..c7f1e77c6c9813e25b0b60a83a22dffc4845b265 100644
(file)
--- a/
src/core/cgroup.c
+++ b/
src/core/cgroup.c
@@
-728,16
+728,15
@@
int manager_notify_cgroup_empty(Manager *m, const char *cgroup) {
assert(m);
assert(cgroup);
assert(m);
assert(cgroup);
- r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, cgroup, true);
- if (r == 0)
- return 0;
-
u = manager_get_unit_by_cgroup(m, cgroup);
if (u) {
u = manager_get_unit_by_cgroup(m, cgroup);
if (u) {
- if (UNIT_VTABLE(u)->notify_cgroup_empty)
- UNIT_VTABLE(u)->notify_cgroup_empty(u);
+ r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, true);
+ if (r > 0) {
+ if (UNIT_VTABLE(u)->notify_cgroup_empty)
+ UNIT_VTABLE(u)->notify_cgroup_empty(u);
- unit_add_to_gc_queue(u);
+ unit_add_to_gc_queue(u);
+ }
}
return 0;
}
return 0;