udevd: don't free event when killing the worker, wait until it has been reaped

[elogind.git] / src / udev / udevd.c

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 1c510f44ff6728d477373ef4edddc02d5d0e42e5..9426edca2eba93b7bee9c538bed1c657fd8b0e1b 100644 (file)
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -904,14 +904,17 @@ static void handle_signal(struct udev *udev, int signo) {
 }
 
 static void event_queue_update(void) {
-        if (!udev_list_node_is_empty(&event_list)) {
-                int fd;
+        int r;
 
-                fd = open("/run/udev/queue", O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);
-                if (fd >= 0)
-                       close(fd);
-        } else
-                unlink("/run/udev/queue");
+        if (!udev_list_node_is_empty(&event_list)) {
+                r = touch("/run/udev/queue");
+                if (r < 0)
+                        log_warning_errno(r, "could not touch /run/udev/queue: %m");
+        } else {
+                r = unlink("/run/udev/queue");
+                if (r < 0 && errno != ENOENT)
+                        log_warning("could not unlink /run/udev/queue: %m");
+        }
 }
 
 static int systemd_fds(struct udev *udev, int *rctrl, int *rnetlink) {
@@ -1411,12 +1414,8 @@ int main(int argc, char *argv[]) {
                                                 kill(worker->pid, SIGKILL);
                                                 worker->state = WORKER_KILLED;
 
-                                                /* drop reference taken for state 'running' */
-                                                worker_unref(worker);
                                                 log_error("seq %llu '%s' killed", udev_device_get_seqnum(worker->event->dev), worker->event->devpath);
                                                 worker->event->exitcode = -64;
-                                                event_queue_delete(worker->event);
-                                                worker->event = NULL;
                                         } else if (!worker->event_warned) {
                                                 log_warning("worker ["PID_FMT"] %s is taking a long time", worker->pid, worker->event->devpath);
                                                 worker->event_warned = true;