diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h index 9e69bf6c98..05211b065c 100644 --- a/src/basic/cgroup-util.h +++ b/src/basic/cgroup-util.h @@ -206,9 +206,9 @@ int cg_read_subgroup(DIR *d, char **ret); typedef int (*cg_kill_log_func_t)(const PidRef *pid, int sig, void *userdata); -int cg_kill(const char *path, int sig, CGroupFlags flags, Set *killed_pids, cg_kill_log_func_t kill_log, void *userdata); +int cg_kill(const char *path, int sig, CGroupFlags flags, Set *killed_pids, cg_kill_log_func_t log_kill, void *userdata); int cg_kill_kernel_sigkill(const char *path); -int cg_kill_recursive(const char *path, int sig, CGroupFlags flags, Set *killed_pids, cg_kill_log_func_t kill_log, void *userdata); +int cg_kill_recursive(const char *path, int sig, CGroupFlags flags, Set *killed_pids, cg_kill_log_func_t log_kill, void *userdata); int cg_split_spec(const char *spec, char **ret_controller, char **ret_path); int cg_mangle_path(const char *path, char **ret); diff --git a/src/core/unit.c b/src/core/unit.c index 5cbd0fb76c..f7ff0061fa 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -4928,7 +4928,7 @@ int unit_kill_context(Unit *u, KillOperation k) { SIGHUP, CGROUP_IGNORE_SELF, pid_set, - /* kill_log= */ NULL, + /* log_kill= */ NULL, /* userdata= */ NULL); } } diff --git a/src/udev/udev-manager.c b/src/udev/udev-manager.c index 5601192745..aaaabe0d31 100644 --- a/src/udev/udev-manager.c +++ b/src/udev/udev-manager.c @@ -1321,7 +1321,7 @@ static int on_post(sd_event_source *s, void *userdata) { if (manager->cgroup && set_isempty(manager->synthesize_change_child_event_sources)) /* cleanup possible left-over processes in our cgroup */ - (void) cg_kill(manager->cgroup, SIGKILL, CGROUP_IGNORE_SELF, /* killed_pids=*/ NULL, /* kill_log= */ NULL, /* userdata= */ NULL); + (void) cg_kill(manager->cgroup, SIGKILL, CGROUP_IGNORE_SELF, /* killed_pids=*/ NULL, /* log_kill= */ NULL, /* userdata= */ NULL); return 0; }