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

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