morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

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

No functional change, just refactoring.
This commit is contained in:
Yu Watanabe
2025-08-30 05:43:31 +09:00
parent 4dbf06bd85
commit 6475926a59
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/basic/cgroup-util.c
View File

@@ -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;

2
src/basic/cgroup-util.h
View File

@@ -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);

4
src/network/networkd-sysctl.c
View File

@@ -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");

2
src/nspawn/nspawn-cgroup.c
View File

@@ -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);

2
src/test/test-cgroup-util.c
View File

@@ -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));