From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 16 Jul 2012 17:26:54 +0000 (+0200)
Subject: journald: don't enforce monotonicity of realtime clocks when copying entries
X-Git-Tag: v187~61
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=74d29da52409ab149738ea76824679d29598e0ac;p=elogind.git

journald: don't enforce monotonicity of realtime clocks when copying entries

After all the point of the realtime clock (in contrast to the monotonic
clock) is that it does not have to be strictly monotonic, hence don't
enforce this when flushing the journal from /run to /var.
---

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 0aada9c41..cd5ab266f 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2312,9 +2312,6 @@ int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint6
             ts.monotonic < le64toh(to->header->tail_entry_monotonic))
                 return -EINVAL;
 
-        if (ts.realtime < le64toh(to->header->tail_entry_realtime))
-                return -EINVAL;
-
         n = journal_file_entry_n_items(o);
         items = alloca(sizeof(EntryItem) * n);