summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNir Soffer <nirsof@gmail.com>2015-04-19 03:41:26 +0300
committerAnthony G. Basile <blueness@gentoo.org>2015-05-03 14:38:27 -0400
commit5d4ffb7b7ebaf88b715f03239c32c07a0f61d3b8 (patch)
treefa156a1cb633742a19e03459436e17ebd0b30118
parentcb0e80578d19677ce596e0b80f0e5725836d8972 (diff)
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. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-rw-r--r--src/udev/udevadm-settle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index e60c4623bd..40e3e28b1e 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -149,7 +149,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 */