summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2014-06-27 19:54:45 +0200
committerAnthony G. Basile <blueness@gentoo.org>2014-07-01 07:22:32 -0400
commit9031b0d0a7f357934082eb745e5900618e00da84 (patch)
treeac4f326c6a0ff40fc026fda569977dd5e3073dad
parenta31296d41eca0b996f31f9abe60fce33b036689e (diff)
libudev: queue - watch entire directory to allow the re-use of the watch descriptor
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-rw-r--r--src/libudev/libudev-queue.c2
-rw-r--r--src/udev/udevadm-settle.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c
index d4334b440d..8ef1f3d4b0 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 93b519a612..9cb98c3260 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);
}