dcavalca / rpms / systemd

Forked from rpms/systemd 4 months ago
Clone
9fc0f6
From 0badfa6266d2b5116a14fe2eebcf55f6a072332b Mon Sep 17 00:00:00 2001
9fc0f6
From: Lennart Poettering <lennart@poettering.net>
9fc0f6
Date: Wed, 27 Nov 2013 00:59:07 +0100
9fc0f6
Subject: [PATCH] journal: allow journal_file_copy_entry() to work on non-local
9fc0f6
 files
9fc0f6
9fc0f6
---
9fc0f6
 src/journal/journal-file.c | 4 ----
9fc0f6
 1 file changed, 4 deletions(-)
9fc0f6
9fc0f6
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
9fc0f6
index 53dd0c3..94e3921 100644
9fc0f6
--- a/src/journal/journal-file.c
9fc0f6
+++ b/src/journal/journal-file.c
9fc0f6
@@ -2732,10 +2732,6 @@ int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint6
9fc0f6
         ts.monotonic = le64toh(o->entry.monotonic);
9fc0f6
         ts.realtime = le64toh(o->entry.realtime);
9fc0f6
 
9fc0f6
-        if (to->tail_entry_monotonic_valid &&
9fc0f6
-            ts.monotonic < le64toh(to->header->tail_entry_monotonic))
9fc0f6
-                return -EINVAL;
9fc0f6
-
9fc0f6
         n = journal_file_entry_n_items(o);
9fc0f6
         items = alloca(sizeof(EntryItem) * n);
9fc0f6