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

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 1251538f0f7df584facd71ca741d2e3f4805de52..4f8803f732c5dd258f292a7bdfd015e8b46c123b 100644 (file)
--- 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 fae3709f79aff431c66c0260611a820a20db6f78..621331db06d4df3f7ad0b9a4dd71a0bc044808e2 100644 (file)
--- 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 19ad6f68a9ae26fe6c0961d101a91f049b388a90..78f1968d79dff29d959375f0127c687041152a34 100644 (file)
--- 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 ce9056ddafd265bd9b83fd4347ca9e40b98d6e7a..30e6a4cc778ecb450e7f827b15d56bbbdc7cf386 100644 (file)
--- 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 a524cfad22c945297d3d609520d34835513c4057..45dc2fae62c854aa88fffa7ca50c2dc00e71ce36 100644 (file)
--- 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 323204725fb7b4fe85dcb4a1536f26527ba0fb07..43962206d2ffbbcb99c53107f3a0f35d9d5d6e95 100644 (file)
--- 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);