summaryrefslogtreecommitdiff
path: root/src/udev/udev-ctrl.c
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2014-04-24 15:40:08 -0400
committerAnthony G. Basile <blueness@gentoo.org>2014-04-24 15:40:08 -0400
commit2500dbc810d8898c1359c6579715586fffa08a27 (patch)
treee24445a5829c7c4f4da6bf7652ece1acaf008b6c /src/udev/udev-ctrl.c
parentdbc5e32faeca842ec5a4a07702080b3195e21d66 (diff)
udev: remove seqnum API and all assumptions about seqnums
The way the kernel namespaces have been implemented breaks assumptions udev made regarding uevent sequence numbers. Creating devices in a namespace "steals" uevents and its sequence numbers from the host. It confuses the "udevadmin settle" logic, which might block until util a timeout is reached, even when no uevent is pending. Remove any assumptions about sequence numbers and deprecate libudev's API exposing these numbers; none of that can reliably be used anymore when namespaces are involved. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/udev/udev-ctrl.c')
-rw-r--r--src/udev/udev-ctrl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index 522195ced7..8d07c993b7 100644
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -297,7 +297,7 @@ static int ctrl_send(struct udev_ctrl *uctrl, enum udev_ctrl_msg_type type, int
pfd[0].fd = uctrl->sock;
pfd[0].events = POLLIN;
- r = poll(pfd, 1, timeout * 1000);
+ r = poll(pfd, 1, timeout * MSEC_PER_SEC);
if (r < 0) {
if (errno == EINTR)
continue;