valeriyvdovin / rpms / systemd

Forked from rpms/systemd 4 years ago
Clone

Blame SOURCES/0615-timer-we-already-got-the-trigger-before-no-need-to-c.patch

a9339c
From cfa30c21a4e5324a43695fcf43fe984aed2a8a8e Mon Sep 17 00:00:00 2001
a9339c
From: Lukas Nykryn <lnykryn@redhat.com>
a9339c
Date: Mon, 26 Feb 2018 13:56:52 +0100
a9339c
Subject: [PATCH] timer: we already got the trigger before, no need to call
a9339c
 UNIT_TRIGGER again
a9339c
a9339c
In d7b2f6ef we forgot to replace this occurence.
a9339c
a9339c
rhel-only
a9339c
a9339c
Resolves: #1549119
a9339c
---
a9339c
 src/core/timer.c | 2 +-
a9339c
 1 file changed, 1 insertion(+), 1 deletion(-)
a9339c
a9339c
diff --git a/src/core/timer.c b/src/core/timer.c
a9339c
index 91d8db67e..0a264f60d 100644
a9339c
--- a/src/core/timer.c
a9339c
+++ b/src/core/timer.c
a9339c
@@ -421,7 +421,7 @@ static void timer_enter_waiting(Timer *t, bool initial) {
a9339c
 
a9339c
                         case TIMER_UNIT_INACTIVE:
a9339c
 
a9339c
-                                base = UNIT_TRIGGER(UNIT(t))->inactive_enter_timestamp.monotonic;
a9339c
+                                base = trigger->inactive_enter_timestamp.monotonic;
a9339c
 
a9339c
                                 if (base <= 0)
a9339c
                                         base = t->last_trigger.monotonic;