diff options
| -rw-r--r-- | src/journal/journal-file.c | 8 | ||||
| -rw-r--r-- | src/journal/sd-journal.c | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index 1dbe81849c..bd9f9fe5a2 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -2745,12 +2745,14 @@ int journal_file_compare_locations(JournalFile *af, JournalFile *bf) { assert(af->location_type == LOCATION_SEEK); assert(bf->location_type == LOCATION_SEEK); - /* If contents and timestamps match, these entries are - * identical, even if the seqnum does not match */ + /* If contents, timestamps and seqnum match, these entries are + * identical*/ if (sd_id128_equal(af->current_boot_id, bf->current_boot_id) && af->current_monotonic == bf->current_monotonic && af->current_realtime == bf->current_realtime && - af->current_xor_hash == bf->current_xor_hash) + af->current_xor_hash == bf->current_xor_hash && + sd_id128_equal(af->header->seqnum_id, bf->header->seqnum_id) && + af->current_seqnum == bf->current_seqnum) return 0; if (sd_id128_equal(af->header->seqnum_id, bf->header->seqnum_id)) { diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index cb1ab88ca5..346970d1f7 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -448,6 +448,9 @@ _pure_ static int compare_with_location(const JournalFile *f, const Location *l, f->current_realtime == l->realtime && l->xor_hash_set && f->current_xor_hash == l->xor_hash && + l->seqnum_set && + sd_id128_equal(f->header->seqnum_id, l->seqnum_id) && + f->current_seqnum == l->seqnum && f != current_file) return 0; |