SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-journal: boot_id is always non-NULL

Browse Source 
The two callers of journal_file_append_entry_internal() always pass
non-NULL boot ID.
This commit is contained in:
Yu Watanabe
2023-09-26 13:26:22 +09:00
parent 6ea51363c8
commit b761ae0fca
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-journal/journal-file.c
+3 -4
View File
@@ -2298,6 +2298,7 @@ static int journal_file_append_entry_internal(
assert(f);
assert(f->header);
assert(ts);
assert(boot_id);
assert(items || n_items == 0);
if (f->strict_order) {
@@ -2318,7 +2319,7 @@ static int journal_file_append_entry_internal(
"timestamp %" PRIu64 ", refusing entry.",
ts->realtime, le64toh(f->header->tail_entry_realtime));
if ((!boot_id || sd_id128_equal(*boot_id, f->header->tail_entry_boot_id)) &&
if (sd_id128_equal(*boot_id, f->header->tail_entry_boot_id) &&
ts->monotonic < le64toh(f->header->tail_entry_monotonic))
return log_debug_errno(
SYNTHETIC_ERRNO(ENOTNAM),
@@ -2358,9 +2359,7 @@ static int journal_file_append_entry_internal(
o->entry.realtime = htole64(ts->realtime);
o->entry.monotonic = htole64(ts->monotonic);
o->entry.xor_hash = htole64(xor_hash);
if (boot_id)
f->header->tail_entry_boot_id = *boot_id;
o->entry.boot_id = f->header->tail_entry_boot_id;
o->entry.boot_id = f->header->tail_entry_boot_id = *boot_id;
for (size_t i = 0; i < n_items; i++)
write_entry_item(f, o, i, &items[i]);