summaryrefslogtreecommitdiffstats
path: root/src/shutdown
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2024-11-22 22:40:22 +0100
committerYu Watanabe <watanabe.yu+github@gmail.com>2024-11-23 09:32:51 +0100
commit1e9fb1d4567b37d78941f596040b0548b4982f11 (patch)
tree510dbd6441b8169dd61303983e41db66f99c3cf7 /src/shutdown
parentnamespace-util: handle -ENOSPC by userns_acquire() gracefully in is_idmapping... (diff)
downloadsystemd-1e9fb1d4567b37d78941f596040b0548b4982f11.tar.xz
systemd-1e9fb1d4567b37d78941f596040b0548b4982f11.zip
shutdown: propagate one more error from sync_making_progress()
No functional change, just refactoring, as anyway all errors will be ignored by the caller.
Diffstat (limited to 'src/shutdown')
-rw-r--r--src/shutdown/shutdown.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
index 57bb9a82d0..e26a8579c5 100644
--- a/src/shutdown/shutdown.c
+++ b/src/shutdown/shutdown.c
@@ -211,10 +211,8 @@ static int sync_making_progress(unsigned long long *prev_dirty) {
continue;
errno = 0;
- if (sscanf(line, "%*s %llu %*s", &ull) != 1) {
- log_warning_errno(errno_or_else(EIO), "Failed to parse /proc/meminfo field, ignoring: %m");
- return false;
- }
+ if (sscanf(line, "%*s %llu %*s", &ull) != 1)
+ return log_warning_errno(errno_or_else(EIO), "Failed to parse /proc/meminfo field: %m");
val += ull;
}