From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 22 Nov 2019 15:11:20 +0000 (+0100)
Subject: journald: hide current storage determination in helper call
X-Git-Tag: v245-rc1~41^2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b42b9479a8e25cb22de06046f3f809cdb8694442;p=thirdparty%2Fsystemd.git

journald: hide current storage determination in helper call
---

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index ad0d2f7349b..1440d821024 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -163,13 +163,19 @@ static void patch_min_use(JournalStorage *storage) {
         storage->metrics.min_use = MAX(storage->metrics.min_use, storage->space.vfs_used);
 }
 
+static JournalStorage* server_current_storage(Server *s) {
+        assert(s);
+
+        return s->system_journal ? &s->system_storage : &s->runtime_storage;
+}
+
 static int determine_space(Server *s, uint64_t *available, uint64_t *limit) {
         JournalStorage *js;
         int r;
 
         assert(s);
 
-        js = s->system_journal ? &s->system_storage : &s->runtime_storage;
+        js = server_current_storage(s);
 
         r = cache_space_refresh(s, js);
         if (r >= 0) {
@@ -189,7 +195,7 @@ void server_space_usage_message(Server *s, JournalStorage *storage) {
         assert(s);
 
         if (!storage)
-                storage = s->system_journal ? &s->system_storage : &s->runtime_storage;
+                storage = server_current_storage(s);
 
         if (cache_space_refresh(s, storage) < 0)
                 return;