chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: show unit file preset state in "systemctl status" output"
[elogind.git]
/
src
/
core
/
scope.c
diff --git
a/src/core/scope.c
b/src/core/scope.c
index 19b274a267817f46f247124cb7857522b43fc84c..f0efec051646d9851625c8ef1efe712dfaf5d7e7 100644
(file)
--- a/
src/core/scope.c
+++ b/
src/core/scope.c
@@
-289,10
+289,8
@@
static int scope_start(Unit *u) {
return -ENOENT;
r = unit_realize_cgroup(u);
return -ENOENT;
r = unit_realize_cgroup(u);
- if (r < 0) {
- log_error_errno(r, "Failed to realize cgroup: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to realize cgroup: %m");
r = cg_attach_many_everywhere(u->manager->cgroup_supported, u->cgroup_path, UNIT(s)->pids);
if (r < 0)
r = cg_attach_many_everywhere(u->manager->cgroup_supported, u->cgroup_path, UNIT(s)->pids);
if (r < 0)
@@
-384,15
+382,14
@@
static int scope_deserialize_item(Unit *u, const char *key, const char *value, F
}
static bool scope_check_gc(Unit *u) {
}
static bool scope_check_gc(Unit *u) {
- Scope *s = SCOPE(u);
- int r;
-
- assert(s);
+ assert(u);
/* Never clean up scopes that still have a process around,
* even if the scope is formally dead. */
if (u->cgroup_path) {
/* Never clean up scopes that still have a process around,
* even if the scope is formally dead. */
if (u->cgroup_path) {
+ int r;
+
r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, true);
if (r <= 0)
return true;
r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, true);
if (r <= 0)
return true;