From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 14 May 2025 11:02:46 +0000 (+0200)
Subject: fork-journal: some follow-ups (#37423)
X-Git-Tag: v258-rc1~627
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86bb6f40522b56c7a0f2dd86d8b2e519a381b172;p=thirdparty%2Fsystemd.git

fork-journal: some follow-ups (#37423)
---

86bb6f40522b56c7a0f2dd86d8b2e519a381b172
diff --cc src/journal/journald-sync.c
index 657a4937231,e3b28f77f03..972f37bfc15
--- a/src/journal/journald-sync.c
+++ b/src/journal/journald-sync.c
@@@ -127,18 -127,18 +127,18 @@@ SyncReq* sync_req_free(SyncReq *req) 
          if (!req)
                  return NULL;
  
 -        if (req->server) {
 +        if (req->manager) {
                  if (req->realtime_prioq_idx != PRIOQ_IDX_NULL)
 -                        assert_se(prioq_remove(req->server->sync_req_realtime_prioq, req, &req->realtime_prioq_idx) > 0);
 +                        assert_se(prioq_remove(req->manager->sync_req_realtime_prioq, req, &req->realtime_prioq_idx) > 0);
  
                  if (req->boottime_prioq_idx != PRIOQ_IDX_NULL)
 -                        assert_se(prioq_remove(req->server->sync_req_boottime_prioq, req, &req->boottime_prioq_idx) > 0);
 +                        assert_se(prioq_remove(req->manager->sync_req_boottime_prioq, req, &req->boottime_prioq_idx) > 0);
  
                  if (req->pending_rqlen > 0)
 -                        LIST_REMOVE(pending_rqlen, req->server->sync_req_pending_rqlen, req);
 +                        LIST_REMOVE(pending_rqlen, req->manager->sync_req_pending_rqlen, req);
          }
  
-         req->idle_event_source = sd_event_source_disable_unref(req->idle_event_source);
+         sd_event_source_disable_unref(req->idle_event_source);
  
          sd_varlink_unref(req->link);