chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup: rename cg_unified() → cg_unified_controller()
[elogind.git]
/
src
/
core
/
cgroup.c
diff --git
a/src/core/cgroup.c
b/src/core/cgroup.c
index bc5ff23a10c704e249a396e47c9051b7bad2e632..bda1d53499ddde46fa83820222484f9ed3635e88 100644
(file)
--- a/
src/core/cgroup.c
+++ b/
src/core/cgroup.c
@@
-1261,7
+1261,7
@@
int unit_watch_cgroup(Unit *u) {
return 0;
/* Only applies to the unified hierarchy */
return 0;
/* Only applies to the unified hierarchy */
- r = cg_unified(SYSTEMD_CGROUP_CONTROLLER);
+ r = cg_unified
_controller
(SYSTEMD_CGROUP_CONTROLLER);
if (r < 0)
return log_error_errno(r, "Failed to determine whether the name=systemd hierarchy is unified: %m");
if (r == 0)
if (r < 0)
return log_error_errno(r, "Failed to determine whether the name=systemd hierarchy is unified: %m");
if (r == 0)
@@
-1686,7
+1686,7
@@
int unit_watch_all_pids(Unit *u) {
if (!u->cgroup_path)
return -ENOENT;
if (!u->cgroup_path)
return -ENOENT;
- r = cg_unified(SYSTEMD_CGROUP_CONTROLLER);
+ r = cg_unified
_controller
(SYSTEMD_CGROUP_CONTROLLER);
if (r < 0)
return r;
if (r > 0) /* On unified we can use proper notifications */
if (r < 0)
return r;
if (r > 0) /* On unified we can use proper notifications */
@@
-1814,7
+1814,7
@@
int manager_setup_cgroup(Manager *m) {
if (r > 0)
log_debug("Unified cgroup hierarchy is located at %s.", path);
else {
if (r > 0)
log_debug("Unified cgroup hierarchy is located at %s.", path);
else {
- r = cg_unified(SYSTEMD_CGROUP_CONTROLLER);
+ r = cg_unified
_controller
(SYSTEMD_CGROUP_CONTROLLER);
if (r < 0)
return log_error_errno(r, "Failed to determine whether systemd's own controller is in unified mode: %m");
if (r > 0)
if (r < 0)
return log_error_errno(r, "Failed to determine whether systemd's own controller is in unified mode: %m");
if (r > 0)
@@
-1827,7
+1827,7
@@
int manager_setup_cgroup(Manager *m) {
const char *scope_path;
/* 3. Install agent */
const char *scope_path;
/* 3. Install agent */
- if (cg_unified(SYSTEMD_CGROUP_CONTROLLER) > 0) {
+ if (cg_unified
_controller
(SYSTEMD_CGROUP_CONTROLLER) > 0) {
/* In the unified hierarchy we can get
* cgroup empty notifications via inotify. */
/* In the unified hierarchy we can get
* cgroup empty notifications via inotify. */