27 lines
1011 B
Diff
27 lines
1011 B
Diff
|
From 00a827da3737dc95c2561292c03468fc96f53f14 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Wed, 27 Nov 2013 00:59:07 +0100
|
||
|
|
Subject: [PATCH] journal: allow journal_file_copy_entry() to work on non-local
|
||
|
|
files
|
||
|
|
|
||
|
|
(cherry picked from commit 248c78c79c5cca9b981800d816a77591e504066a)
|
||
|
|
---
|
||
|
|
src/journal/journal-file.c | 4 ----
|
||
|
|
1 file changed, 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
|
||
|
|
index 4e22e08..e0abddf 100644
|
||
|
|
--- a/src/journal/journal-file.c
|
||
|
|
+++ b/src/journal/journal-file.c
|
||
|
|
@@ -2739,10 +2739,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);
|
||
|
|
|
||
|
|
- 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);
|
||
|
|
|