Revert "udevd: fix crash when workers time out after exit is signal caught"

This reverts commit 5db454b8031c58a743cc4ee3d5d1dd01dcff17e8.
See https://github.com/systemd/systemd/issues/14128

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 2bb322796b26015855709be602171ef74688d17c..144a20ec63fbcf2db2e14844e6df4f6994f4ead5 100644 (file)
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -293,8 +293,6 @@ static void manager_free(Manager *manager) {
         if (!manager)
                 return;
 
-        manager->monitor = sd_device_monitor_unref(manager->monitor);
-
         udev_builtin_exit();
 
         if (manager->pid == getpid_cached())
@@ -791,6 +789,8 @@ static void manager_exit(Manager *manager) {
         manager->inotify_event = sd_event_source_unref(manager->inotify_event);
         manager->fd_inotify = safe_close(manager->fd_inotify);
 
+        manager->monitor = sd_device_monitor_unref(manager->monitor);
+
         /* discard queued events and kill workers */
         event_queue_cleanup(manager, EVENT_QUEUED);
         manager_kill_workers(manager);