From: Daniel Mack <daniel@zonque.org>
Date: Fri, 24 Jul 2015 15:40:55 +0000 (+0200)
Subject: automount: do not start expiration timer for TimeoutIdleSec=0
X-Git-Tag: v223~38^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F714%2Fhead;p=thirdparty%2Fsystemd.git

automount: do not start expiration timer for TimeoutIdleSec=0

The timer value for automount unit specified with TimeoutIdleSec= is rounded
up to one second if that directive is set to 0.

Fix this by bailing early in automount_enter_runnning() in case no timeout is
requested.
---

diff --git a/src/core/automount.c b/src/core/automount.c
index 342dd8f0a97..b8a8a92b54c 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -672,6 +672,9 @@ static int automount_start_expire(Automount *a) {
 
         assert(a);
 
+        if (a->timeout_idle_usec == 0)
+                return 0;
+
         timeout = now(CLOCK_MONOTONIC) + MAX(a->timeout_idle_usec/3, USEC_PER_SEC);
 
         if (a->expire_event_source) {