From: Ivan Kruglov <mail@ikruglov.com>
Date: Wed, 6 Nov 2024 10:12:28 +0000 (+0100)
Subject: use report_errno_and_exit() in src/shutdown/umount.c
X-Git-Tag: v257-rc1~10^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f72a64f3525a5aa26829e17ef8c8214534f677da;p=thirdparty%2Fsystemd.git

use report_errno_and_exit() in src/shutdown/umount.c
---

diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index ca6d36e0549..4bc01c75e08 100644
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -274,8 +274,7 @@ static int remount_with_timeout(MountPoint *m, bool last_try) {
                                        "Failed to remount '%s' read-only: %m",
                                        m->path);
 
-                (void) write(pfd[1], &r, sizeof(r)); /* try to send errno up */
-                _exit(r < 0 ? EXIT_FAILURE : EXIT_SUCCESS);
+                report_errno_and_exit(pfd[1], r);
         }
 
         pfd[1] = safe_close(pfd[1]);
@@ -337,8 +336,7 @@ static int umount_with_timeout(MountPoint *m, bool last_try) {
                                 log_umount_blockers(m->path);
                 }
 
-                (void) write(pfd[1], &r, sizeof(r)); /* try to send errno up */
-                _exit(r < 0 ? EXIT_FAILURE : EXIT_SUCCESS);
+                report_errno_and_exit(pfd[1], r);
         }
 
         pfd[1] = safe_close(pfd[1]);