Merge pull request #3375 from brauner/2020-04-12/fixes

cgroups: ignore legacy limits on pure cgroup2 systems

Merge pull request #3375 from brauner/2020-04-12/fixes
0443ed92 · Stéphane Graber · GitHub · e9071702 · b96aa96f · 0443ed92
Unverified Commit 0443ed92 authored Apr 12, 2020 by Stéphane Graber Committed by GitHub Apr 12, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

cgfsng.c src/lxc/cgroups/cgfsng.c +3 -0

No files found.
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -2847,6 +2847,9 @@ __cgfsng_ops static bool cgfsng_setup_limits_legacy(struct cgroup_ops *ops,
 	if (!ops->hierarchies)
 		return ret_set_errno(false, EINVAL);

+	if (!pure_unified_layout(ops))
+		return log_warn_errno(true, EINVAL, "Ignoring legacy cgroup limits on pure cgroup2 system");
+
 	sorted_cgroup_settings = sort_cgroup_settings(cgroup_settings);
 	if (!sorted_cgroup_settings)
 		return false;