39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
From f6e8ba816577a1a26037a8aeae23fda36d74f0ac Mon Sep 17 00:00:00 2001
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
Date: Wed, 18 Sep 2019 01:28:23 +0900
|
|
Subject: [PATCH] udevadm: use usec_add()
|
|
|
|
Also fixes description of event source.
|
|
Reference: https://github.com/systemd/systemd/commit/f6e8ba816577a1a26037a8aeae23fda36d74f0ac
|
|
Conflict: NA
|
|
---
|
|
src/udev/udev-ctrl.c | 9 ++++-----
|
|
1 file changed, 4 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
|
|
index 751e034982..f1befc7304 100644
|
|
--- a/src/udev/udev-ctrl.c
|
|
+++ b/src/udev/udev-ctrl.c
|
|
@@ -395,14 +395,13 @@ int udev_ctrl_wait(struct udev_ctrl *uctrl, usec_t timeout) {
|
|
(void) sd_event_source_set_description(source_io, "udev-ctrl-wait-io");
|
|
|
|
if (timeout != USEC_INFINITY) {
|
|
- usec_t usec;
|
|
-
|
|
- usec = now(clock_boottime_or_monotonic()) + timeout;
|
|
- r = sd_event_add_time(uctrl->event, &source_timeout, clock_boottime_or_monotonic(), usec, 0, NULL, INT_TO_PTR(-ETIMEDOUT));
|
|
+ r = sd_event_add_time(uctrl->event, &source_timeout, clock_boottime_or_monotonic(),
|
|
+ usec_add(now(clock_boottime_or_monotonic()), timeout),
|
|
+ 0, NULL, INT_TO_PTR(-ETIMEDOUT));
|
|
if (r < 0)
|
|
return r;
|
|
|
|
- (void) sd_event_source_set_description(source_timeout, "udev-ctrl-wait-io");
|
|
+ (void) sd_event_source_set_description(source_timeout, "udev-ctrl-wait-timeout");
|
|
}
|
|
|
|
return sd_event_loop(uctrl->event);
|
|
--
|
|
2.23.0
|
|
|