chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a6c9b1c
)
journald: don't enforce monotonicity of realtime clocks when copying entries
author
Lennart Poettering
<lennart@poettering.net>
Mon, 16 Jul 2012 17:26:54 +0000
(19:26 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 16 Jul 2012 17:26:54 +0000
(19:26 +0200)
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.
src/journal/journal-file.c
patch
|
blob
|
history
diff --git
a/src/journal/journal-file.c
b/src/journal/journal-file.c
index
0aada9c
..
cd5ab26
100644
(file)
--- 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);