blob: 3d456ec83a6c3fb09c0674e4e01f71a3f8209447 [file] [log] [blame]
Andrew Geissler82c905d2020-04-13 13:39:40 -05001From bb28a9c870bb47dcdb1ccebaa8e3a5a86730a244 Mon Sep 17 00:00:00 2001
Brad Bishop19323692019-04-05 15:28:33 -04002From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 4 Jul 2018 15:00:44 +0800
Andrew Geissler82c905d2020-04-13 13:39:40 -05004Subject: [PATCH] Do not disable buffering when writing to oom_score_adj
Brad Bishop19323692019-04-05 15:28:33 -04005
6On musl, disabling buffering when writing to oom_score_adj will
7cause the following error.
8
9 Failed to adjust OOM setting: Invalid argument
10
11This error appears for systemd-udevd.service and dbus.service.
12This is because kernel receives '-' instead of the whole '-900'
13if buffering is disabled.
14
15This is libc implementation specific, as glibc does not have this issue.
16
17Upstream-Status: Inappropriate [musl specific]
18
19Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Brad Bishopa34c0302019-09-23 22:34:48 -040020[rebased for systemd 243]
21Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Andrew Geissler82c905d2020-04-13 13:39:40 -050022
Brad Bishop19323692019-04-05 15:28:33 -040023---
24 src/basic/process-util.c | 2 +-
25 1 file changed, 1 insertion(+), 1 deletion(-)
26
Andrew Geissler635e0e42020-08-21 15:58:33 -050027Index: systemd-stable/src/basic/process-util.c
28===================================================================
29--- systemd-stable.orig/src/basic/process-util.c
30+++ systemd-stable/src/basic/process-util.c
31@@ -1536,7 +1536,7 @@ int set_oom_score_adjust(int value) {
Brad Bishop19323692019-04-05 15:28:33 -040032 sprintf(t, "%i", value);
33
34 return write_string_file("/proc/self/oom_score_adj", t,
35- WRITE_STRING_FILE_VERIFY_ON_FAILURE|WRITE_STRING_FILE_DISABLE_BUFFER);
36+ WRITE_STRING_FILE_VERIFY_ON_FAILURE);
37 }
38
Andrew Geissler82c905d2020-04-13 13:39:40 -050039 int pidfd_get_pid(int fd, pid_t *ret) {