X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fcgroup.c;h=bda1d53499ddde46fa83820222484f9ed3635e88;hp=bc5ff23a10c704e249a396e47c9051b7bad2e632;hb=ed1d9d8147489c95859f436594ae837209c4907e;hpb=37199e725d1f2bb3ec1cdb582172401697bd4b7c

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index bc5ff23a1..bda1d5349 100644
--- 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 */
-        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)
@@ -1686,7 +1686,7 @@ int unit_watch_all_pids(Unit *u) {
         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 */
@@ -1814,7 +1814,7 @@ int manager_setup_cgroup(Manager *m) {
         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)
@@ -1827,7 +1827,7 @@ int manager_setup_cgroup(Manager *m) {
                 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. */