From: Kay Sievers Date: Mon, 4 Jun 2012 16:10:50 +0000 (+0200) Subject: udev: reset /proc/self/oom_score_adj in worker processes X-Git-Tag: v185~2 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=145dae7eb3367933e0d0bfcde3a7a77bb549aa61;p=systemd udev: reset /proc/self/oom_score_adj in worker processes Only the main daemon process should be excluded from OOM handling, not the worker processes or their child processes. --- diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 8ad1ecca..2ac9fde0 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -262,6 +262,9 @@ static void worker_new(struct event *event) /* request TERM signal if parent exits */ prctl(PR_SET_PDEATHSIG, SIGTERM); + /* reset OOM score, we only protect the main daemon */ + write_one_line_file("/proc/self/oom_score_adj", "0"); + for (;;) { struct udev_event *udev_event; struct worker_message msg; @@ -1230,7 +1233,6 @@ int main(int argc, char *argv[]) if (daemonize) { pid_t pid; - int fd; pid = fork(); switch (pid) { @@ -1247,11 +1249,7 @@ int main(int argc, char *argv[]) setsid(); - fd = open("/proc/self/oom_score_adj", O_RDWR|O_CLOEXEC); - if (fd >= 0) { - write(fd, "-1000", 5); - close(fd); - } + write_one_line_file("/proc/self/oom_score_adj", "-1000"); } else { sd_notify(1, "READY=1"); }