forked from pool/systemd
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
|
From 8a7a0c19edd2d971d4aa9d635f7978af841e8278 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kay Sievers <kay@vrfy.org>
|
||
|
|
Date: Fri, 27 Jun 2014 19:54:45 +0200
|
||
|
|
Subject: [PATCH] libudev: queue - watch entire directory to allow the re-use
|
||
|
|
of the watch descriptor
|
||
|
|
|
||
|
|
---
|
||
|
|
src/libudev/libudev-queue.c | 2 +-
|
||
|
|
src/udev/udevadm-settle.c | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git src/libudev/libudev-queue.c src/libudev/libudev-queue.c
|
||
|
|
index d4334b4..8ef1f3d 100644
|
||
|
|
--- src/libudev/libudev-queue.c
|
||
|
|
+++ 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 src/udev/udevadm-settle.c src/udev/udevadm-settle.c
|
||
|
|
index 79e8b59..fa5b0c2 100644
|
||
|
|
--- src/udev/udevadm-settle.c
|
||
|
|
+++ 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);
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
1.7.9.2
|
||
|
|
|