40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
|
From bb28a9c870bb47dcdb1ccebaa8e3a5a86730a244 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Chen Qi <Qi.Chen@windriver.com>
|
||
|
|
Date: Wed, 4 Jul 2018 15:00:44 +0800
|
||
|
|
Subject: [PATCH] Do not disable buffering when writing to oom_score_adj
|
||
|
|
|
||
|
|
On musl, disabling buffering when writing to oom_score_adj will
|
||
|
|
cause the following error.
|
||
|
|
|
||
|
|
Failed to adjust OOM setting: Invalid argument
|
||
|
|
|
||
|
|
This error appears for systemd-udevd.service and dbus.service.
|
||
|
|
This is because kernel receives '-' instead of the whole '-900'
|
||
|
|
if buffering is disabled.
|
||
|
|
|
||
|
|
This is libc implementation specific, as glibc does not have this issue.
|
||
|
|
|
||
|
|
Upstream-Status: Inappropriate [musl specific]
|
||
|
|
|
||
|
|
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
||
|
|
[rebased for systemd 243]
|
||
|
|
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
|
||
|
|
|
||
|
|
---
|
||
|
|
src/basic/process-util.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
|
||
|
|
index 644f53aee005..acaf13591396 100644
|
||
|
|
--- a/src/basic/process-util.c
|
||
|
|
+++ b/src/basic/process-util.c
|
||
|
|
@@ -1500,7 +1500,7 @@ int set_oom_score_adjust(int value) {
|
||
|
|
sprintf(t, "%i", value);
|
||
|
|
|
||
|
|
return write_string_file("/proc/self/oom_score_adj", t,
|
||
|
|
- WRITE_STRING_FILE_VERIFY_ON_FAILURE|WRITE_STRING_FILE_DISABLE_BUFFER);
|
||
|
|
+ WRITE_STRING_FILE_VERIFY_ON_FAILURE);
|
||
|
|
}
|
||
|
|
|
||
|
|
int pidfd_get_pid(int fd, pid_t *ret) {
|