cgroup-util: drop 'controller' argument from cg_enumerate_subgroups()

Nowadays it always takes SYSTEMD_CGROUP_CONTROLLER as controller.
Let's drop it.

No functional change, just refactoring.

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 4f8803f732c5dd258f292a7bdfd015e8b46c123b..d9b6d68bf77a972a9a109fe90eb8b79f7eae1195 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -232,7 +232,7 @@ bool cg_kill_supported(void) {
         return (supported = false);
 }
 
-int cg_enumerate_subgroups(const char *controller, const char *path, DIR **ret) {
+int cg_enumerate_subgroups(const char *path, DIR **ret) {
         _cleanup_free_ char *fs = NULL;
         DIR *d;
         int r;
@@ -241,7 +241,7 @@ int cg_enumerate_subgroups(const char *controller, const char *path, DIR **ret)
 
         /* This is not recursive! */
 
-        r = cg_get_path(controller, path, NULL, &fs);
+        r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, path, NULL, &fs);
         if (r < 0)
                 return r;
 
@@ -399,7 +399,7 @@ int cg_kill_recursive(
 
         ret = cg_kill(path, sig, flags, killed_pids, log_kill, userdata);
 
-        r = cg_enumerate_subgroups(SYSTEMD_CGROUP_CONTROLLER, path, &d);
+        r = cg_enumerate_subgroups(path, &d);
         if (r < 0) {
                 if (r != -ENOENT)
                         RET_GATHER(ret, log_debug_errno(r, "Failed to enumerate cgroup '%s' subgroups: %m", path));

diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index 621331db06d4df3f7ad0b9a4dd71a0bc044808e2..206d7ede3f1c485aa0b4ab684fba82f705eccd0b 100644 (file)
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -159,7 +159,7 @@ int cg_enumerate_processes(const char *path, FILE **ret);
 int cg_read_pid(FILE *f, pid_t *ret, CGroupFlags flags);
 int cg_read_pidref(FILE *f, PidRef *ret, CGroupFlags flags);
 
-int cg_enumerate_subgroups(const char *controller, const char *path, DIR **ret);
+int cg_enumerate_subgroups(const char *path, DIR **ret);
 int cg_read_subgroup(DIR *d, char **ret);
 
 typedef int (*cg_kill_log_func_t)(const PidRef *pid, int sig, void *userdata);

diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
index 78f1968d79dff29d959375f0127c687041152a34..9a3f1a811bdf35cfdf01ab10a4e0023c7b89d232 100644 (file)
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -458,7 +458,7 @@ static int refresh(
         if (r < 0)
                 return r;
 
-        r = cg_enumerate_subgroups(SYSTEMD_CGROUP_CONTROLLER, path, &d);
+        r = cg_enumerate_subgroups(path, &d);
         if (r == -ENOENT) {
                 if (ret)
                         *ret = NULL;

diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index 45dc2fae62c854aa88fffa7ca50c2dc00e71ce36..493315cf3b04ffcb25a843d8b84836546ac6f515 100644 (file)
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -1411,7 +1411,7 @@ static int append_cgroup(sd_bus_message *reply, const char *p, Set *pids) {
                         return r;
         }
 
-        r = cg_enumerate_subgroups(SYSTEMD_CGROUP_CONTROLLER, p, &d);
+        r = cg_enumerate_subgroups(p, &d);
         if (r == -ENOENT)
                 return 0;
         if (r < 0)

diff --git a/src/oom/oomd-manager.c b/src/oom/oomd-manager.c
index 7ff245c4370cc36d110a578aaa9066048387f24f..52ecb17580d7ca967dac515f357fc841355d45c0 100644 (file)
--- a/src/oom/oomd-manager.c
+++ b/src/oom/oomd-manager.c
@@ -210,7 +210,7 @@ static int recursively_get_cgroup_context(Hashmap *new_h, const char *path) {
         assert(new_h);
         assert(path);
 
-        r = cg_enumerate_subgroups(SYSTEMD_CGROUP_CONTROLLER, path, &d);
+        r = cg_enumerate_subgroups(path, &d);
         if (r < 0)
                 return r;