From eb04385dc564e8925b7f534c1003b9bd66426812 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 28 Nov 2018 20:24:07 +0100 Subject: [PATCH] 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. --- src/core/swap.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/core/swap.c b/src/core/swap.c index d91132fabd..88fb06153f 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) { -- 2.25.1