From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 29 May 2020 22:32:31 +0000 (+0200)
Subject: journal-file: simplify boot ID acquiring
X-Git-Tag: v246-rc1~84^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e958c057033e3ac636c13d3af4d0a7b38f5cb629;p=thirdparty%2Fsystemd.git

journal-file: simplify boot ID acquiring
---

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index b1e092224f7..f6b7c660945 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -445,7 +445,6 @@ static int journal_file_init_header(JournalFile *f, JournalFile *template) {
 }
 
 static int journal_file_refresh_header(JournalFile *f) {
-        sd_id128_t boot_id;
         int r;
 
         assert(f);
@@ -458,12 +457,10 @@ static int journal_file_refresh_header(JournalFile *f) {
         else if (r < 0)
                 return r;
 
-        r = sd_id128_get_boot(&boot_id);
+        r = sd_id128_get_boot(&f->header->boot_id);
         if (r < 0)
                 return r;
 
-        f->header->boot_id = boot_id;
-
         r = journal_file_set_online(f);
 
         /* Sync the online state to disk */