cgroup-util: rename 's' -> 'killed_pids'

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index e11a6a3e49235f1dcdc6c3ef182f237044010437..f0b91254dc7814ebc6d78190afa01ffd695fbbe8 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -292,7 +292,7 @@ int cg_kill(
                 const char *path,
                 int sig,
                 CGroupFlags flags,
-                Set *s,
+                Set *killed_pids,
                 cg_kill_log_func_t log_kill,
                 void *userdata) {
 
@@ -312,9 +312,9 @@ int cg_kill(
          *
          * When sending SIGKILL, prefer cg_kill_kernel_sigkill(), which is fully atomic. */
 
-        if (!s) {
-                s = allocated_set = set_new(NULL);
-                if (!s)
+        if (!killed_pids) {
+                killed_pids = allocated_set = set_new(NULL);
+                if (!killed_pids)
                         return -ENOMEM;
         }
 
@@ -343,7 +343,7 @@ int cg_kill(
                         if ((flags & CGROUP_IGNORE_SELF) && pidref_is_self(&pidref))
                                 continue;
 
-                        if (set_contains(s, PID_TO_PTR(pidref.pid)))
+                        if (set_contains(killed_pids, PID_TO_PTR(pidref.pid)))
                                 continue;
 
                         /* Ignore kernel threads to mimic the behavior of cgroup.kill. */
@@ -373,7 +373,7 @@ int cg_kill(
 
                         done = false;
 
-                        r = set_put(s, PID_TO_PTR(pidref.pid));
+                        r = set_put(killed_pids, PID_TO_PTR(pidref.pid));
                         if (r < 0)
                                 return RET_GATHER(ret, r);
                 }
@@ -390,7 +390,7 @@ int cg_kill_recursive(
                 const char *path,
                 int sig,
                 CGroupFlags flags,
-                Set *s,
+                Set *killed_pids,
                 cg_kill_log_func_t log_kill,
                 void *userdata) {
 
@@ -401,13 +401,13 @@ int cg_kill_recursive(
         assert(path);
         assert(sig >= 0);
 
-        if (!s) {
-                s = allocated_set = set_new(NULL);
-                if (!s)
+        if (!killed_pids) {
+                killed_pids = allocated_set = set_new(NULL);
+                if (!killed_pids)
                         return -ENOMEM;
         }
 
-        ret = cg_kill(path, sig, flags, s, log_kill, userdata);
+        ret = cg_kill(path, sig, flags, killed_pids, log_kill, userdata);
 
         r = cg_enumerate_subgroups(SYSTEMD_CGROUP_CONTROLLER, path, &d);
         if (r < 0) {
@@ -432,7 +432,7 @@ int cg_kill_recursive(
                 if (!p)
                         return -ENOMEM;
 
-                r = cg_kill_recursive(p, sig, flags, s, log_kill, userdata);
+                r = cg_kill_recursive(p, sig, flags, killed_pids, log_kill, userdata);
                 if (r < 0)
                         log_debug_errno(r, "Failed to recursively kill processes in cgroup '%s': %m", p);
                 if (r != 0 && ret >= 0)

diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index 42c03e54b7199fce2fd001c3a7bbc2edebe2818b..9e69bf6c98df8039f6486c72524263fefd3ccff4 100644 (file)
--- 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 *s, 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 kill_log, void *userdata);
 int cg_kill_kernel_sigkill(const char *path);
-int cg_kill_recursive(const char *path, int sig, CGroupFlags flags, Set *s, 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 kill_log, 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 bb30d704cf26288d8680073816dab2805ba00dd3..5cbd0fb76cca4ed758fcf7ca5b6e05d68bcc0894 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -6008,7 +6008,7 @@ int unit_warn_leftover_processes(Unit *u, bool start) {
                         crt->cgroup_path,
                         /* sig= */ 0,
                         /* flags= */ 0,
-                        /* set= */ NULL,
+                        /* killed_pids= */ NULL,
                         start ? unit_log_leftover_process_start : unit_log_leftover_process_stop,
                         u);
 }

diff --git a/src/udev/udev-manager.c b/src/udev/udev-manager.c
index f92a186dd4ae0aeb6a86026a75fb4b15b54ee9d3..5601192745ae73e02bbcf7404f5e9a0c723215c7 100644 (file)
--- 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, /* set=*/ NULL, /* kill_log= */ NULL, /* userdata= */ NULL);
+                (void) cg_kill(manager->cgroup, SIGKILL, CGROUP_IGNORE_SELF, /* killed_pids=*/ NULL, /* kill_log= */ NULL, /* userdata= */ NULL);
 
         return 0;
 }