anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

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

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