From: Mike Yuan Date: Fri, 11 Jul 2025 20:38:49 +0000 (+0200) Subject: core/cgroup: remove deserialization for "cpuacct-usage-base" X-Git-Tag: v258-rc1~63^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77af13ffdbaf0fbda4c46e8ce403589b00dbdc32;p=thirdparty%2Fsystemd.git core/cgroup: remove deserialization for "cpuacct-usage-base" This has been superseded by "cpu-usage-base" ever since the introduction of cgroup v2. With upgrading and thus deserialzing from cgroup v1 systems becoming impossible it is eligible for removal. --- diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 118fe988a68..c2f6f47e6e0 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -4380,8 +4380,7 @@ int cgroup_runtime_deserialize_one(Unit *u, const char *key, const char *value, if (!UNIT_HAS_CGROUP_CONTEXT(u)) return 0; - if (MATCH_DESERIALIZE_IMMEDIATE(u, "cpu-usage-base", key, value, safe_atou64, cpu_usage_base) || - MATCH_DESERIALIZE_IMMEDIATE(u, "cpuacct-usage-base", key, value, safe_atou64, cpu_usage_base)) + if (MATCH_DESERIALIZE_IMMEDIATE(u, "cpu-usage-base", key, value, safe_atou64, cpu_usage_base)) return 1; if (MATCH_DESERIALIZE_IMMEDIATE(u, "cpu-usage-last", key, value, safe_atou64, cpu_usage_last))