diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-07-24 19:15:54 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-07-24 19:15:54 +0200 |
| commit | 0b071992bbdf6a2bfdbe1a064a2f8270be8779c4 (patch) | |
| tree | dc8ed08f9f0837e7b0ee3c87153fb25b3daa5c7d /src | |
| parent | 408d84e50ebd7ca5cb644a7a90a53320f528c5f1 (diff) | |
| parent | 93a3b53b2be5566b8f05746860645cbe99059701 (diff) | |
Merge pull request #714 from zonque/automount
automount: do not start expiration timer for TimeoutIdleSec=0
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/automount.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/automount.c b/src/core/automount.c index 342dd8f0a9..b8a8a92b54 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) { |