From dfc4b6acf088f71f717fce8866a5841091219fa5 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Mon, 9 Mar 2015 22:19:52 +0100 Subject: [PATCH] udev: simplify event_queue_update() and add debug logging This essentially replaces open("/run/udev/queue", O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444) with open("/run/udev/queue", O_WRONLY|O_CREAT|O_CLOEXEC|O_NOCTTY, 0644), which is ok for our purposes. --- src/udev/udevd.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 1c510f4..c01fb4b 100644 --- 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) { -- 2.7.4