aca11a0f41
5003-cgroup-rename-TasksMax-structure-to-CGroupTasksMax.patch 5004-bus-print-properties-ignore-CGROUP_LIMIT_MAX-for-Mem.patch 5005-bus-print-properties-prettify-more-unset-properties.patch 5006-cgroup-Add-EffectiveMemoryMax-EffectiveMemoryHigh-an.patch 5007-test-Convert-rlimit-test-to-subtest-of-generic-limit.patch 5008-test-Add-effective-cgroup-limits-testing.patch 5009-cgroup-Restrict-effective-limits-with-global-resourc.patch 5010-cgroup-Rename-effective-limits-internal-table.patch They are temporarily put in quarantine to get broader testing but should be eventually moved to the git repo. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1485
65 lines
2.7 KiB
Diff
65 lines
2.7 KiB
Diff
From 0c3448f0e341e3e1f23722e4275c4fdd4062d280 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Michal=20Koutn=C3=BD?= <mkoutny@suse.com>
|
|
Date: Tue, 23 Jan 2024 11:30:21 +0100
|
|
Subject: [PATCH 5010/5011] cgroup: Rename effective limits internal table
|
|
|
|
Post-merge fixup of commit 4fb0d2dc14 ("cgroup: Add EffectiveMemoryMax=,
|
|
EffectiveMemoryHigh= and EffectiveTasksMax= properties"), no functional
|
|
change intended.
|
|
|
|
(cherry picked from commit 8ad614890bba66b5f6b590d6a3e1b8b04a920126)
|
|
|
|
[mkoutny: adjust context]
|
|
[mkoutny: fixes jsc#PED-5659]
|
|
---
|
|
src/core/cgroup.c | 4 ++--
|
|
src/core/cgroup.h | 4 ++--
|
|
src/core/dbus-unit.c | 2 +-
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
|
|
index a53d90486c..2d8d61a26d 100644
|
|
--- a/src/core/cgroup.c
|
|
+++ b/src/core/cgroup.c
|
|
@@ -4470,10 +4470,10 @@ static const char* const cgroup_pressure_watch_table[_CGROUP_PRESSURE_WATCH_MAX]
|
|
|
|
DEFINE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(cgroup_pressure_watch, CGroupPressureWatch, CGROUP_PRESSURE_WATCH_ON);
|
|
|
|
-static const char *const cgroup_limit_type_table[_CGROUP_LIMIT_TYPE_MAX] = {
|
|
+static const char *const cgroup_effective_limit_type_table[_CGROUP_LIMIT_TYPE_MAX] = {
|
|
[CGROUP_LIMIT_MEMORY_MAX] = "EffectiveMemoryMax",
|
|
[CGROUP_LIMIT_MEMORY_HIGH] = "EffectiveMemoryHigh",
|
|
[CGROUP_LIMIT_TASKS_MAX] = "EffectiveTasksMax",
|
|
};
|
|
|
|
-DEFINE_STRING_TABLE_LOOKUP(cgroup_limit_type, CGroupLimitType);
|
|
+DEFINE_STRING_TABLE_LOOKUP(cgroup_effective_limit_type, CGroupLimitType);
|
|
diff --git a/src/core/cgroup.h b/src/core/cgroup.h
|
|
index a19a2fffa3..9ff650abcf 100644
|
|
--- a/src/core/cgroup.h
|
|
+++ b/src/core/cgroup.h
|
|
@@ -389,5 +389,5 @@ FreezerAction freezer_action_from_string(const char *s) _pure_;
|
|
const char* cgroup_pressure_watch_to_string(CGroupPressureWatch a) _const_;
|
|
CGroupPressureWatch cgroup_pressure_watch_from_string(const char *s) _pure_;
|
|
|
|
-const char* cgroup_limit_type_to_string(CGroupLimitType m) _const_;
|
|
-CGroupLimitType cgroup_limit_type_from_string(const char *s) _pure_;
|
|
+const char* cgroup_effective_limit_type_to_string(CGroupLimitType m) _const_;
|
|
+CGroupLimitType cgroup_effective_limit_type_from_string(const char *s) _pure_;
|
|
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
|
|
index b4509a990e..da22e8f524 100644
|
|
--- a/src/core/dbus-unit.c
|
|
+++ b/src/core/dbus-unit.c
|
|
@@ -1455,7 +1455,7 @@ static int property_get_effective_limit(
|
|
assert(reply);
|
|
assert(property);
|
|
|
|
- assert_se((type = cgroup_limit_type_from_string(property)) >= 0);
|
|
+ assert_se((type = cgroup_effective_limit_type_from_string(property)) >= 0);
|
|
(void) unit_get_effective_limit(u, type, &value);
|
|
return sd_bus_message_append(reply, "t", value);
|
|
}
|
|
--
|
|
2.35.3
|
|
|