X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudevd.c;h=8eaf2cdc8c36c602870e8c5bb295a562ee2c42bb;hb=e530ed5e1407e0571afc01552e41365ffb01befa;hp=ac21d511bb6bca4b4f9543d6b987b72b55419db0;hpb=6969c349df91a3cc5fc2cf559a14e32a84db969d;p=elogind.git diff --git a/src/udev/udevd.c b/src/udev/udevd.c index ac21d511b..8eaf2cdc8 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -291,7 +291,7 @@ static void worker_new(struct event *event) { fd_lock = open(udev_device_get_devnode(d), O_RDONLY|O_CLOEXEC|O_NOFOLLOW|O_NONBLOCK); if (fd_lock >= 0 && flock(fd_lock, LOCK_SH|LOCK_NB) < 0) { log_debug_errno(errno, "Unable to flock(%s), skipping event handling: %m", udev_device_get_devnode(d)); - err = -EWOULDBLOCK; + err = -EAGAIN; fd_lock = safe_close(fd_lock); goto skip; } @@ -1474,8 +1474,8 @@ int main(int argc, char *argv[]) { struct udev_device *dev; dev = udev_monitor_receive_device(monitor); - if (dev != NULL) { - udev_device_set_usec_initialized(dev, now(CLOCK_MONOTONIC)); + if (dev) { + udev_device_ensure_usec_initialized(dev, NULL); if (event_queue_insert(dev) < 0) udev_device_unref(dev); }