From: Nir Soffer <nirsof@gmail.com>
Date: Sun, 19 Apr 2015 00:41:26 +0000 (+0300)
Subject: udev: settle should return immediately when timeout is 0
X-Git-Tag: v220~400
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf23b9f86f6807c3029a6a46e1999ae0c87ca22a;p=thirdparty%2Fsystemd.git

udev: settle should return immediately when timeout is 0

udevadm manual says:

    A value of 0 will check if the queue is empty and always return
    immediately.

However, currently we ignore the deadline if the value is 0, and wait
without any limit.

Zero timeout behaved according to the documentation until commit
ead7c62ab7 (udevadm: settle - kill alarm()). Looking at this patch, it
seems that the behavior change was unintended.

This patch restores the documented behavior.
---

diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index 2c84ada0b10..437c79408a6 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -142,7 +142,7 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) {
                         break;
                 }
 
-                if (timeout > 0 && now(CLOCK_MONOTONIC) >= deadline)
+                if (now(CLOCK_MONOTONIC) >= deadline)
                         break;
 
                 /* wake up when queue is empty */