system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-22 10:44:58 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

udev: remove /run/udev/queue in on_post()

Browse source 
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().
This commit is contained in:
Yu Watanabe 2022-03-13 21:22:57 +09:00 committed by Lennart Poettering
parent 9612da361a
commit 4029328014
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/udev/udevd.c
View file

@ -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 */