From: Mike Yuan <me@yhndnzj.com>
Date: Thu, 9 May 2024 16:29:37 +0000 (+0800)
Subject: core/service: remove unnecessary reset of notify_access_override
X-Git-Tag: v256-rc2~30
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=d9b8d86bcdcb160cb70562cf5769c078bcb54010;p=systemd%2F.git

core/service: remove unnecessary reset of notify_access_override

This already gets reset in service_enter_dead()
and service_start().
---

diff --git a/src/core/service.c b/src/core/service.c
index 3fb3cae844..8ec27c463a 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2021,8 +2021,7 @@ static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart)
                 r = service_arm_timer(s, /* relative= */ true, restart_usec_next);
                 if (r < 0) {
                         log_unit_warning_errno(UNIT(s), r, "Failed to install restart timer: %m");
-                        service_enter_dead(s, SERVICE_FAILURE_RESOURCES, /* allow_restart= */ false);
-                        return;
+                        return service_enter_dead(s, SERVICE_FAILURE_RESOURCES, /* allow_restart= */ false);
                 }
 
                 log_unit_debug(UNIT(s), "Next restart interval calculated as: %s", FORMAT_TIMESPAN(restart_usec_next, 0));
@@ -2548,8 +2547,6 @@ static void service_enter_restart(Service *s) {
         s->n_restarts++;
         s->flush_n_restarts = false;
 
-        s->notify_access_override = _NOTIFY_ACCESS_INVALID;
-
         log_unit_struct(UNIT(s), LOG_INFO,
                         "MESSAGE_ID=" SD_MESSAGE_UNIT_RESTART_SCHEDULED_STR,
                         LOG_UNIT_INVOCATION_ID(UNIT(s)),