From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 25 Oct 2018 15:42:30 +0000 (+0200)
Subject: journal: refactor out loop that processes deferred closes into its own function
X-Git-Tag: v240~467^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f760d8a858ca4462ce92d5aab3de78af8b62b058;p=thirdparty%2Fsystemd.git

journal: refactor out loop that processes deferred closes into its own function
---

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index e0ec438b1e6..1f19a56696b 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -459,6 +459,18 @@ static int do_rotate(
         return r;
 }
 
+static void server_process_deferred_closes(Server *s) {
+        JournalFile *f;
+        Iterator i;
+
+        /* Perform any deferred closes which aren't still offlining. */
+        SET_FOREACH(f, s->deferred_closes, i)
+                if (!journal_file_is_offlining(f)) {
+                        (void) set_remove(s->deferred_closes, f);
+                        (void) journal_file_close(f);
+                }
+}
+
 void server_rotate(Server *s) {
         JournalFile *f;
         void *k;
@@ -479,12 +491,7 @@ void server_rotate(Server *s) {
                         ordered_hashmap_remove(s->user_journals, k);
         }
 
-        /* Perform any deferred closes which aren't still offlining. */
-        SET_FOREACH(f, s->deferred_closes, i)
-                if (!journal_file_is_offlining(f)) {
-                        (void) set_remove(s->deferred_closes, f);
-                        (void) journal_file_close(f);
-                }
+        server_process_deferred_closes(s);
 }
 
 void server_sync(Server *s) {