From: Kay Sievers <kay@vrfy.org>
Date: Fri, 27 Jun 2014 17:54:45 +0000 (+0200)
Subject: libudev: queue - watch entire directory to allow the re-use of the watch descriptor
X-Git-Tag: v215~140
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8a7a0c19edd2d971d4aa9d635f7978af841e8278;p=elogind.git

libudev: queue - watch entire directory to allow the re-use of the watch descriptor
---

diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c
index d4334b440..8ef1f3d4b 100644
--- a/src/libudev/libudev-queue.c
+++ b/src/libudev/libudev-queue.c
@@ -245,7 +245,7 @@ _public_ int udev_queue_get_fd(struct udev_queue *udev_queue) {
         if (fd < 0)
                 return -errno;
 
-        r = inotify_add_watch(fd, "/run/udev/queue" , IN_DELETE);
+        r = inotify_add_watch(fd, "/run/udev" , IN_DELETE);
         if (r < 0) {
                 r = -errno;
                 close(fd);
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index 79e8b5990..fa5b0c2d2 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -135,7 +135,7 @@ static int adm_settle(struct udev *udev, int argc, char *argv[])
                 }
 
                 /* wake up when queue is empty */
-                if (poll(pfd, 1, 100) > 0 && pfd[0].revents & POLLIN)
+                if (poll(pfd, 1, MSEC_PER_SEC) > 0 && pfd[0].revents & POLLIN)
                         udev_queue_flush(queue);
         }