From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 17 Sep 2019 16:28:23 +0000 (+0900)
Subject: udevadm: use usec_add()
X-Git-Tag: archive/raspbian/243-7+rpi1^2~72
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ba98aac360119b64cb6bcceea7ee7ab4440536c2;p=systemd.git

udevadm: use usec_add()

Also fixes description of event source.

(cherry picked from commit f6e8ba816577a1a26037a8aeae23fda36d74f0ac)
(cherry picked from commit 7ed7ea82f6a8387893f4741ccaeb0111770854c8)

Gbp-Pq: Name udevadm-use-usec_add.patch
---

diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index 751e0349..f1befc73 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);