]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
cgroup-util: drop cg_freezer_supported(), assume supported
authorMike Yuan <me@yhndnzj.com>
Wed, 15 Jan 2025 21:05:56 +0000 (22:05 +0100)
committerMike Yuan <me@yhndnzj.com>
Mon, 21 Apr 2025 14:29:40 +0000 (16:29 +0200)
src/basic/cgroup-util.c
src/basic/cgroup-util.h
src/core/cgroup.c
src/core/unit.c

index 4baadf0c6bfd920b898a4bbdb0ec6374a5a856be..a117dfcbf7e8fe621fb450c56251370b5356e622 100644 (file)
@@ -254,22 +254,6 @@ bool cg_ns_supported(void) {
         return (supported = false);
 }
 
-bool cg_freezer_supported(void) {
-        static thread_local int supported = -1;
-
-        if (supported >= 0)
-                return supported;
-
-        if (cg_all_unified() <= 0)
-                return (supported = false);
-
-        if (access("/sys/fs/cgroup/init.scope/cgroup.freeze", F_OK) >= 0)
-                return (supported = true);
-        if (errno != ENOENT)
-                log_debug_errno(errno, "Failed to check whether cgroup freezer is available, assuming not: %m");
-        return (supported = false);
-}
-
 bool cg_kill_supported(void) {
         static thread_local int supported = -1;
 
index 26a4fb5633babdc823832d96518df47118ebe7bd..0fb6b7677d2d7c4584bd6e4f1e4fd26b772b0e12 100644 (file)
@@ -312,7 +312,6 @@ int cg_mask_from_string(const char *s, CGroupMask *ret);
 int cg_mask_to_string(CGroupMask mask, char **ret);
 
 bool cg_ns_supported(void);
-bool cg_freezer_supported(void);
 bool cg_kill_supported(void);
 
 int cg_all_unified(void);
index 30929ef5ebc554e02439dba7b4ec575e4a622702..f2f313bc003bb250afdb48a4a1a4219659ee23ff 100644 (file)
@@ -4386,9 +4386,6 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) {
         assert(action >= 0);
         assert(action < _FREEZER_ACTION_MAX);
 
-        if (!cg_freezer_supported())
-                return 0;
-
         unit_next_freezer_state(u, action, &next, &objective);
 
         CGroupRuntime *crt = unit_get_cgroup_runtime(u);
index 75d5921faa44cc050f0b57780158ef834e017a90..65ca8ddcfb51b6e78290d19d0f31b2c4a1811a11 100644 (file)
@@ -6296,7 +6296,7 @@ int unit_freezer_action(Unit *u, FreezerAction action) {
         assert(u);
         assert(IN_SET(action, FREEZER_FREEZE, FREEZER_THAW));
 
-        if (!cg_freezer_supported() || !unit_can_freeze(u))
+        if (!unit_can_freeze(u))
                 return -EOPNOTSUPP;
 
         if (u->job)