From: Nick Rosbrook <nick.rosbrook@canonical.com>
Date: Tue, 29 Nov 2022 20:49:05 +0000 (-0500)
Subject: oomd: fix doc comment for oomd_fetch_cgroup_oom_preference
X-Git-Tag: v253-rc1~402^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c0562778b98014cc65579b1ed27d3e137f3ed04;p=thirdparty%2Fsystemd.git

oomd: fix doc comment for oomd_fetch_cgroup_oom_preference

Explicitly state that ManagedOOMPreference is always honored when the
unit's cgroup is owned by root.
---

diff --git a/src/oom/oomd-util.h b/src/oom/oomd-util.h
index 7fd9e92109a..a758d5589bf 100644
--- a/src/oom/oomd-util.h
+++ b/src/oom/oomd-util.h
@@ -109,9 +109,10 @@ static inline int compare_swap_usage(OomdCGroupContext * const *c1, OomdCGroupCo
  * Returns the number of sorted items; negative on error. */
 int oomd_sort_cgroup_contexts(Hashmap *h, oomd_compare_t compare_func, const char *prefix, OomdCGroupContext ***ret);
 
-/* If the cgroups represented by `ctx` and `prefix` are owned by the same user,
- * then set `ctx->preference` using the `user.oomd_avoid` and `user.oomd_omit`
- * xattrs. Otherwise, set `ctx->preference` to MANAGED_OOM_PREFERENCE_NONE.
+/* If the the cgroup is owned by root, or the cgroups represented by `ctx` and
+ * `prefix` are owned by the same user, then set `ctx->preference` using the
+ * `user.oomd_avoid` and `user.oomd_omit` xattrs. Otherwise, set
+ * `ctx->preference` to MANAGED_OOM_PREFERENCE_NONE.
  *
  * If `prefix` is NULL or the empty string, it is treated as root. If `prefix`
  * does not specify an ancestor cgroup of `ctx`, -EINVAL is returned. Returns