]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
swap: don't propagate issues with processing /proc/swaps
authorLennart Poettering <lennart@poettering.net>
Wed, 28 Nov 2018 19:24:07 +0000 (20:24 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 7 Dec 2018 16:35:32 +0000 (17:35 +0100)
This follows similar recent changes in mount.c: error should be consider
local, and not be propagated.

src/core/swap.c

index d91132fabd28d907f4c0dc88323f4ecf1dc40551..88fb06153f427ef0e7f1eb6f525d298d2430cda7 100644 (file)
@@ -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) {