From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 23 Jan 2018 17:13:01 +0000 (+0100)
Subject: mount,swap: write event loop priority as "SD_EVENT_PRIORITY_NORMAL-x"
X-Git-Tag: v237~40^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=832316370ba4491553cd7c6647a4f2f7b90d90d6;p=thirdparty%2Fsystemd.git

mount,swap: write event loop priority as "SD_EVENT_PRIORITY_NORMAL-x"

We do that in all other cases, let's do it here too. Since
SD_EVENT_PRIORITY_NORMAL evaluates to zero there's zero effective
difference, but it makes things easier to grok and grep for if we always
express relative priorities within PID 1 only.
---

diff --git a/src/core/mount.c b/src/core/mount.c
index 453a83f93d4..4c12542bd77 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1753,7 +1753,7 @@ static void mount_enumerate(Manager *m) {
                         goto fail;
                 }
 
-                r = sd_event_source_set_priority(m->mount_event_source, -10);
+                r = sd_event_source_set_priority(m->mount_event_source, SD_EVENT_PRIORITY_NORMAL-10);
                 if (r < 0) {
                         log_error_errno(r, "Failed to adjust mount watch priority: %m");
                         goto fail;
diff --git a/src/core/swap.c b/src/core/swap.c
index 849ccbdd431..70097ff2ba5 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -1309,7 +1309,7 @@ static void swap_enumerate(Manager *m) {
                 /* Dispatch this before we dispatch SIGCHLD, so that
                  * we always get the events from /proc/swaps before
                  * the SIGCHLD of /sbin/swapon. */
-                r = sd_event_source_set_priority(m->swap_event_source, -10);
+                r = sd_event_source_set_priority(m->swap_event_source, SD_EVENT_PRIORITY_NORMAL-10);
                 if (r < 0) {
                         log_error_errno(r, "Failed to change /proc/swaps priority: %m");
                         goto fail;