SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shutdown: restore error handling

Browse Source
This commit is contained in:
Mike Yuan
2025-12-20 21:41:01 +01:00
parent f3c6660b9c
commit 8a10293e5d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shutdown/shutdown.c
+6 -3
View File
@@ -250,12 +250,15 @@ int sync_with_progress(int fd) {
* SYNC_PROGRESS_ATTEMPTS lapse without progress being made,
* we assume that the sync is stalled */
for (unsigned checks = 0; checks < SYNC_PROGRESS_ATTEMPTS; checks++) {
r = pidref_wait_for_terminate_full(&pidref, SYNC_TIMEOUT_USEC, /* ret_si= */ NULL);
if (r == 0)
siginfo_t si;
r = pidref_wait_for_terminate_full(&pidref, SYNC_TIMEOUT_USEC, &si);
if (r >= 0 && si.si_code == CLD_EXITED && si.si_status == EXIT_SUCCESS)
/* Sync finished without error (sync() call itself does not return an error code) */
return 0;
if (r != -ETIMEDOUT)
return log_error_errno(r, "Failed to sync %s: %m", what);
return log_error_errno(r < 0 ? r : SYNTHETIC_ERRNO(EPROTO),
"Failed to sync %s: %m", what);
/* Reset the check counter if we made some progress */
if (sync_making_progress(&dirty) > 0)