From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 30 Sep 2023 06:05:23 +0000 (+0900)
Subject: journald: do not close all files stored in Server.deferred_closes
X-Git-Tag: v255-rc1~340^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34d17ac128d1e44dd36531b311c9a856d1624e6d;p=thirdparty%2Fsystemd.git

journald: do not close all files stored in Server.deferred_closes

Just before the call of managed_journal_file_open(), we already called
server_vacuum_deferred_closes(), so there is a room to store the file.
---

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index b6f494b4ce3..8b60369b496 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -655,7 +655,7 @@ static int server_archive_offline_user_journals(Server *s) {
                                 s->compress.threshold_bytes,
                                 &s->system_storage.metrics,
                                 s->mmap,
-                                s->deferred_closes,
+                                /* deferred_closes= */ NULL,
                                 /* template= */ NULL,
                                 &f);
                 if (r < 0) {