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

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 1e36b1486adada9a5d4717ef900ffdad7c04865c..572ea8c04877778a2e07ee05e3cd39572201a63c 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -63,11 +63,11 @@ int cg_is_available(void) {
         return is_fs_type(&fs, CGROUP2_SUPER_MAGIC);
 }
 
-int cg_path_open(const char *controller, const char *path) {
+int cg_path_open(const char *path) {
         _cleanup_free_ char *fs = NULL;
         int r;
 
-        r = cg_get_path(controller, path, /* suffix=*/ NULL, &fs);
+        r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, path, /* suffix= */ NULL, &fs);
         if (r < 0)
                 return r;
 

diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index a7fc9d2ba24437ab4054ebf85f8da9a5807f11be..3731b8562736959c7042f660584b47b20f7dca95 100644 (file)
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -137,7 +137,7 @@ typedef enum CGroupUnified {
 
 int cg_is_available(void);
 
-int cg_path_open(const char *controller, const char *path);
+int cg_path_open(const char *path);
 int cg_cgroupid_open(int cgroupfs_fd, uint64_t id);
 
 int cg_path_from_cgroupid(int cgroupfs_fd, uint64_t id, char **ret);

diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c
index b29d49d79db330d522ed016c0fe4ed3bed63345f..9a493357509cf2a2fc934888f0f692e0960b5b94 100644 (file)
--- a/src/network/networkd-sysctl.c
+++ b/src/network/networkd-sysctl.c
@@ -113,7 +113,7 @@ int manager_install_sysctl_monitor(Manager *manager) {
         if (r < 0)
                 return log_warning_errno(r, "Failed to get cgroup path, ignoring: %m.");
 
-        root_cgroup_fd = cg_path_open(SYSTEMD_CGROUP_CONTROLLER, "/");
+        root_cgroup_fd = cg_path_open("/");
         if (root_cgroup_fd < 0)
                 return log_warning_errno(root_cgroup_fd, "Failed to open cgroup, ignoring: %m");
 
@@ -122,7 +122,7 @@ int manager_install_sysctl_monitor(Manager *manager) {
                 return log_full_errno(errno == EINVAL ? LOG_DEBUG : LOG_INFO, errno,
                                       "Unable to load sysctl monitor BPF program, ignoring: %m");
 
-        cgroup_fd = cg_path_open(SYSTEMD_CGROUP_CONTROLLER, cgroup);
+        cgroup_fd = cg_path_open(cgroup);
         if (cgroup_fd < 0)
                 return log_warning_errno(cgroup_fd, "Failed to open cgroup: %m");
 

diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
index 7cef863c93f0bd4e1af236256a2ff3925fa6e313..de58ffb6a0031b5ae87ee6a20176683da5cf22be 100644 (file)
--- a/src/nspawn/nspawn-cgroup.c
+++ b/src/nspawn/nspawn-cgroup.c
@@ -100,7 +100,7 @@ int create_subcgroup(
         if (userns_mode == USER_NAMESPACE_MANAGED) {
                 _cleanup_close_ int cgroup_fd = -EBADF;
 
-                cgroup_fd = cg_path_open(SYSTEMD_CGROUP_CONTROLLER, payload);
+                cgroup_fd = cg_path_open(payload);
                 if (cgroup_fd < 0)
                         return log_error_errno(cgroup_fd, "Failed to open cgroup %s: %m", payload);
 

diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
index 764e0fb55339efac4fe3fba3736b070e06ccf71d..839bf412dd42cd1c3ddbf0c1187d2e4c00eb753d 100644 (file)
--- a/src/test/test-cgroup-util.c
+++ b/src/test/test-cgroup-util.c
@@ -511,7 +511,7 @@ TEST(cgroupid) {
         if (cg_is_available() <= 0)
                 return (void) log_tests_skipped("cgroupfs v2 is not mounted");
 
-        fd = cg_path_open(SYSTEMD_CGROUP_CONTROLLER, "/");
+        fd = cg_path_open("/");
         ASSERT_OK(fd);
 
         ASSERT_OK(fd_get_path(fd, &p));