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_enumerate_subgroups()

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:22:21 +09:00
parent f8de2107a7
commit 4d1badbbc4
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

2
src/cgtop/cgtop.c
View File

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

2
src/core/dbus-unit.c
View File

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

2
src/oom/oomd-manager.c
View File

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