chiark / gitweb /
journal: allow journal_file_copy_entry() to work on non-local files
authorLennart Poettering <lennart@poettering.net>
Tue, 26 Nov 2013 23:59:07 +0000 (00:59 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 26 Nov 2013 23:59:07 +0000 (00:59 +0100)
src/journal/journal-file.c

index 409be76dd42f47561c73897a913bceebaab6e1fb..14eae8f57e3c65b164e3a58d8cc692ef60d4cde9 100644 (file)
@@ -2732,10 +2732,6 @@ int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint6
         ts.monotonic = le64toh(o->entry.monotonic);
         ts.realtime = le64toh(o->entry.realtime);
 
         ts.monotonic = le64toh(o->entry.monotonic);
         ts.realtime = le64toh(o->entry.realtime);
 
-        if (to->tail_entry_monotonic_valid &&
-            ts.monotonic < le64toh(to->header->tail_entry_monotonic))
-                return -EINVAL;
-
         n = journal_file_entry_n_items(o);
         items = alloca(sizeof(EntryItem) * n);
 
         n = journal_file_entry_n_items(o);
         items = alloca(sizeof(EntryItem) * n);