]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
udev: assume there is no blocker when failed to check event dependencies
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 12 Mar 2022 11:57:15 +0000 (20:57 +0900)
committerLennart Poettering <lennart@poettering.net>
Thu, 24 Mar 2022 15:20:32 +0000 (16:20 +0100)
Previously, if udevd failed to resolve event dependency, the event is
ignored and libudev listeners did not receive the event. This is
inconsistent with the case when a worker failed to process a event,
in that case, the original uevent sent by the kernel is broadcasted to
listeners.

src/udev/udevd.c

index f1f864a4610cf750a4ebbc451b6336e97aadbefa..8c690357b8d373a262c80351d4b3c533151501de 100644 (file)
@@ -951,24 +951,21 @@ static int event_queue_start(Manager *manager) {
 
                 /* do not start event if parent or child event is still running or queued */
                 r = event_is_blocked(event);
+                if (r > 0)
+                        continue;
                 if (r < 0) {
                         sd_device_action_t a = _SD_DEVICE_ACTION_INVALID;
 
                         (void) sd_device_get_action(event->dev, &a);
                         log_device_warning_errno(event->dev, r,
-                                                 "Failed to check event dependency, "
-                                                 "skipping event (SEQNUM=%"PRIu64", ACTION=%s)",
+                                                 "Failed to check dependencies for event (SEQNUM=%"PRIu64", ACTION=%s), "
+                                                 "assuming there is no blocking event, ignoring: %m",
                                                  event->seqnum,
                                                  strna(device_action_to_string(a)));
-
-                        event_free(event);
-                        return r;
                 }
-                if (r > 0)
-                        continue;
 
                 r = event_run(event);
-                if (r <= 0)
+                if (r <= 0) /* 0 means there are no idle workers. Let's escape from the loop. */
                         return r;
         }