]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
fork-journal: some follow-ups (#37423)
authorLennart Poettering <lennart@poettering.net>
Wed, 14 May 2025 11:02:46 +0000 (13:02 +0200)
committerGitHub <noreply@github.com>
Wed, 14 May 2025 11:02:46 +0000 (13:02 +0200)
1  2 
src/journal/journald-sync.c

index 657a49372319ad208323b43ffccb5bc869cb2dcd,e3b28f77f0398b8df4c09efeb322673fc1145331..972f37bfc15f932108b6f0315827c3ebaf6ecbd6
@@@ -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);