From: Franck Bui <fbui@suse.com>
Date: Wed, 12 Oct 2016 07:05:55 +0000 (+0200)
Subject: journal: introduce cache_space_invalidate()
X-Git-Tag: v232~75^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0edc477bd80208596badb9bc147a0d0eb06fbf6;p=thirdparty%2Fsystemd.git

journal: introduce cache_space_invalidate()

Introduce a dedicated helper in order to reset the storage space cache.
---

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 5f77bd296d1..4839c589189 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -125,6 +125,10 @@ static int determine_path_usage(Server *s, const char *path, uint64_t *ret_used,
         return 0;
 }
 
+static void cache_space_invalidate(JournalStorageSpace *space) {
+        memset(space, 0, sizeof(*space));
+}
+
 static int determine_space_for(
                 Server *s,
                 JournalStorage *storage,
@@ -541,11 +545,7 @@ static void do_vacuum(
         if (r < 0 && r != -ENOENT)
                 log_warning_errno(r, "Failed to vacuum %s, ignoring: %m", storage->path);
 
-        storage->space.limit = 0;
-        storage->space.available = 0;
-        storage->space.timestamp = 0;
-        storage->space.vfs_used = 0;
-        storage->space.vfs_available = 0;
+        cache_space_invalidate(&storage->space);
 }
 
 int server_vacuum(Server *s, bool verbose, bool patch_min_use) {