diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 1251538f0f..4f8803f732 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -130,14 +130,14 @@ int cg_get_cgroupid_at(int dfd, const char *path, uint64_t *ret) { return 0; } -int cg_enumerate_processes(const char *controller, const char *path, FILE **ret) { +int cg_enumerate_processes(const char *path, FILE **ret) { _cleanup_free_ char *fs = NULL; FILE *f; int r; assert(ret); - r = cg_get_path(controller, path, "cgroup.procs", &fs); + r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, path, "cgroup.procs", &fs); if (r < 0) return r; @@ -308,7 +308,7 @@ int cg_kill( done = true; - r = cg_enumerate_processes(SYSTEMD_CGROUP_CONTROLLER, path, &f); + r = cg_enumerate_processes(path, &f); if (r == -ENOENT) break; if (r < 0) diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h index fae3709f79..621331db06 100644 --- a/src/basic/cgroup-util.h +++ b/src/basic/cgroup-util.h @@ -155,7 +155,7 @@ typedef enum CGroupFlags { CGROUP_DONT_SKIP_UNMAPPED = 1 << 2, } CGroupFlags; -int cg_enumerate_processes(const char *controller, const char *path, FILE **ret); +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); diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c index 19ad6f68a9..78f1968d79 100644 --- a/src/cgtop/cgtop.c +++ b/src/cgtop/cgtop.c @@ -367,7 +367,7 @@ static int process( _cleanup_fclose_ FILE *f = NULL; pid_t pid; - r = cg_enumerate_processes(SYSTEMD_CGROUP_CONTROLLER, path, &f); + r = cg_enumerate_processes(path, &f); if (r < 0 && r != -ENOENT) return r; if (r >= 0) { diff --git a/src/core/cgroup.c b/src/core/cgroup.c index ce9056ddaf..30e6a4cc77 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -2857,7 +2857,7 @@ int unit_search_main_pid(Unit *u, PidRef *ret) { if (!crt || !crt->cgroup_path) return -ENXIO; - r = cg_enumerate_processes(SYSTEMD_CGROUP_CONTROLLER, crt->cgroup_path, &f); + r = cg_enumerate_processes(crt->cgroup_path, &f); if (r < 0) return r; diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index a524cfad22..45dc2fae62 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -1375,7 +1375,7 @@ static int append_cgroup(sd_bus_message *reply, const char *p, Set *pids) { assert(reply); assert(p); - r = cg_enumerate_processes(SYSTEMD_CGROUP_CONTROLLER, p, &f); + r = cg_enumerate_processes(p, &f); if (r == -ENOENT) return 0; if (r < 0) diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c index 323204725f..43962206d2 100644 --- a/src/shared/cgroup-setup.c +++ b/src/shared/cgroup-setup.c @@ -334,7 +334,7 @@ int cg_migrate( done = true; - r = cg_enumerate_processes(SYSTEMD_CGROUP_CONTROLLER, from, &f); + r = cg_enumerate_processes(from, &f); if (r < 0) return RET_GATHER(ret, r);