From c6f78234d1d1c6065ecc56240f217d1fdbeb1771 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 17 Jun 2021 17:14:10 +0900
Subject: [PATCH] udev: skip event when its dependency cannot be checked
 
Reference:https://github.com/systemd/systemd/commit/c6f78234d1d1c6065ecc56240f217d1fdbeb1771
Conflict:NA
 
---
 src/udev/udevd.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)
 
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index be2c3ee..683938d 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -910,7 +910,7 @@ no_blocker:
 }
 
 static int event_queue_start(Manager *manager) {
-        Event *event;
+        Event *event, *event_next;
         usec_t usec;
         int r;
 
@@ -943,12 +943,26 @@ static int event_queue_start(Manager *manager) {
                         return log_warning_errno(r, "Failed to read udev rules: %m");
         }
 
-        LIST_FOREACH(event, event, manager->events) {
+        LIST_FOREACH_SAFE(event, event, event_next, manager->events) {
                 if (event->state != EVENT_QUEUED)
                         continue;
 
-                /* do not start event if parent or child event is still running */
-                if (event_is_blocked(event) != 0)
+                /* do not start event if parent or child event is still running or queued */
+                r = event_is_blocked(event);
+                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)",
+                                                 event->seqnum,
+                                                 strna(device_action_to_string(a)));
+
+                        event_free(event);
+                        return r;
+                }
+                if (r > 0)
                         continue;
 
                 r = event_run(event);
-- 
2.33.0
 