]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
udev-spawn: fix typo and simplify code
authorAntonio Alvarez Feijoo <antonio.feijoo@suse.com>
Mon, 27 May 2024 15:17:52 +0000 (17:17 +0200)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 19 Jun 2024 10:36:53 +0000 (19:36 +0900)
Follow-up for 11706971e8b6aa289af56454330fffd87f5d5a78

src/udev/udev-spawn.c

index 3f867a8eb2e3883da439bba1b589778f13e75d05..d2a422f7e8c9bebda5ce9d011140454ce787a886 100644 (file)
@@ -349,13 +349,12 @@ void udev_event_execute_run(UdevEvent *event) {
                                 log_device_debug_errno(event->dev, r, "Failed to run built-in command \"%s\", ignoring: %m", command);
                 } else {
                         if (event->worker && event->worker->exec_delay_usec > 0) {
-                                usec_t timeout_usec = event->worker ? event->worker->timeout_usec : DEFAULT_WORKER_TIMEOUT_USEC;
                                 usec_t now_usec = now(CLOCK_MONOTONIC);
                                 usec_t age_usec = usec_sub_unsigned(now_usec, event->birth_usec);
 
-                                if (event->worker->exec_delay_usec >= usec_sub_unsigned(timeout_usec, age_usec)) {
+                                if (event->worker->exec_delay_usec >= usec_sub_unsigned(event->worker->timeout_usec, age_usec)) {
                                         log_device_warning(event->dev,
-                                                           "Cannot delaying execution of \"%s\" for %s, skipping.",
+                                                           "Cannot delay execution of \"%s\" for %s, skipping.",
                                                            command, FORMAT_TIMESPAN(event->worker->exec_delay_usec, USEC_PER_SEC));
                                         continue;
                                 }