53 lines
2.1 KiB
Diff
53 lines
2.1 KiB
Diff
From 4029328014be9350ca9fc0774ad936c8b5e50ff2 Mon Sep 17 00:00:00 2001
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
Date: Sun, 13 Mar 2022 21:22:57 +0900
|
|
Subject: [PATCH] udev: remove /run/udev/queue in on_post()
|
|
|
|
When the last queued event is processed, information about subsequent
|
|
events may be already queued in the netlink socket of sd-device-monitor.
|
|
In that case, previously we once removed /run/udev/queue and touch the
|
|
file soon later, and `udevadm settle` mistakenly considered all events
|
|
are processed.
|
|
|
|
To mitigate such situation, this makes /run/udev/queue removed in on_post().
|
|
|
|
Reference:https://github.com/systemd/systemd/commit/4029328014be9350ca9fc0774ad936c8b5e50ff2
|
|
Conflict:NA
|
|
|
|
---
|
|
src/udev/udevd.c | 14 +++++++-------
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
|
|
index 6bb9eeb4bb37..8389c39f652f 100644
|
|
--- a/src/udev/udevd.c
|
|
+++ b/src/udev/udevd.c
|
|
@@ -171,12 +171,6 @@ static Event *event_free(Event *event) {
|
|
if (event->worker)
|
|
event->worker->event = NULL;
|
|
|
|
- /* only clean up the queue from the process that created it */
|
|
- if (LIST_IS_EMPTY(event->manager->events) &&
|
|
- event->manager->pid == getpid_cached())
|
|
- if (unlink("/run/udev/queue") < 0 && errno != ENOENT)
|
|
- log_warning_errno(errno, "Failed to unlink /run/udev/queue, ignoring: %m");
|
|
-
|
|
return mfree(event);
|
|
}
|
|
|
|
@@ -1480,7 +1474,13 @@ static int on_post(sd_event_source *s, void *userdata) {
|
|
if (!LIST_IS_EMPTY(manager->events))
|
|
return 1;
|
|
|
|
- /* There are no pending events. Let's cleanup idle process. */
|
|
+ /* There are no queued events. Let's remove /run/udev/queue and clean up the idle processes. */
|
|
+
|
|
+ if (unlink("/run/udev/queue") < 0) {
|
|
+ if (errno != ENOENT)
|
|
+ log_warning_errno(errno, "Failed to unlink /run/udev/queue, ignoring: %m");
|
|
+ } else
|
|
+ log_debug("No events are queued, removing /run/udev/queue.");
|
|
|
|
if (!hashmap_isempty(manager->workers)) {
|
|
/* There are idle workers */
|
|
|