From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 2 Aug 2024 21:20:02 +0000 (+0900)
Subject: Merge pull request #33911 from YHNdnzj/cgroup-setup-cleanup
X-Git-Tag: v257-rc1~753
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=564547d295dd3da6d67df57546fb550db86781db;p=thirdparty%2Fsystemd.git

Merge pull request #33911 from YHNdnzj/cgroup-setup-cleanup

cgroup-setup/util: several cleanups; make use of cgroup.kill on client request
---

564547d295dd3da6d67df57546fb550db86781db
diff --cc src/basic/cgroup-util.c
index 1608326bc39,55a36c4f1b6..18bc0ff2aed
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@@ -368,10 -348,10 +348,10 @@@ static int cg_kill_items
                          if ((flags & CGROUP_IGNORE_SELF) && pidref_is_self(&pidref))
                                  continue;
  
-                         if (set_get(s, PID_TO_PTR(pidref.pid)) == PID_TO_PTR(pidref.pid))
+                         if (set_contains(s, PID_TO_PTR(pidref.pid)))
                                  continue;
  
 -                        /* Ignore kernel threads to mimick the behavior of cgroup.kill. */
 +                        /* Ignore kernel threads to mimic the behavior of cgroup.kill. */
                          if (pidref_is_kernel_thread(&pidref) > 0) {
                                  log_debug("Ignoring kernel thread with pid " PID_FMT " in cgroup '%s'", pidref.pid, path);
                                  continue;