From: Franck Bui <fbui@suse.com>
Date: Mon, 6 Sep 2021 09:06:35 +0000 (+0200)
Subject: core: watchdog_runtimeout_wait() already returns USEC_INFINITY when the watchdog... 
X-Git-Tag: v250-rc1~670^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12663295ca7fbff951c6f9747daecadc593f4c93;p=thirdparty%2Fsystemd.git

core: watchdog_runtimeout_wait() already returns USEC_INFINITY when the watchdog is disabled or closed
---

diff --git a/src/core/manager.c b/src/core/manager.c
index b767b0ee6c5..7d3602c71cd 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2978,7 +2978,7 @@ int manager_loop(Manager *m) {
                 return log_error_errno(r, "Failed to enable SIGCHLD event source: %m");
 
         while (m->objective == MANAGER_OK) {
-                usec_t wait_usec, watchdog_usec;
+                usec_t watchdog_usec;
 
                 watchdog_usec = manager_get_watchdog(m, WATCHDOG_RUNTIME);
                 if (m->runtime_watchdog_running)
@@ -3020,12 +3020,7 @@ int manager_loop(Manager *m) {
                         continue;
 
                 /* Sleep for watchdog runtime wait time */
-                if (timestamp_is_set(watchdog_usec))
-                        wait_usec = watchdog_runtime_wait();
-                else
-                        wait_usec = USEC_INFINITY;
-
-                r = sd_event_run(m->event, wait_usec);
+                r = sd_event_run(m->event, watchdog_runtime_wait());
                 if (r < 0)
                         return log_error_errno(r, "Failed to run event loop: %m");
         }