From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 28 Nov 2018 19:24:07 +0000 (+0100)
Subject: swap: don't propagate issues with processing /proc/swaps
X-Git-Tag: v240~112^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb04385dc564e8925b7f534c1003b9bd66426812;p=thirdparty%2Fsystemd.git

swap: don't propagate issues with processing /proc/swaps

This follows similar recent changes in mount.c: error should be consider
local, and not be propagated.
---

diff --git a/src/core/swap.c b/src/core/swap.c
index d91132fabd2..88fb06153f4 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -1111,7 +1111,6 @@ static int swap_dispatch_timer(sd_event_source *source, usec_t usec, void *userd
 
 static int swap_load_proc_swaps(Manager *m, bool set_flags) {
         unsigned i;
-        int r = 0;
 
         assert(m);
 
@@ -1143,12 +1142,10 @@ static int swap_load_proc_swaps(Manager *m, bool set_flags) {
 
                 device_found_node(m, d, DEVICE_FOUND_SWAP, DEVICE_FOUND_SWAP);
 
-                k = swap_process_new(m, d, prio, set_flags);
-                if (k < 0)
-                        r = k;
+                (void) swap_process_new(m, d, prio, set_flags);
         }
 
-        return r;
+        return 0;
 }
 
 static int swap_dispatch_io(sd_event_source *source, int fd, uint32_t revents, void *userdata) {