d66047d776
Virt patch which had to be backed-out is enabled again, along with the patch to fix the compilation issues.
25 lines
1.0 KiB
Diff
25 lines
1.0 KiB
Diff
From 6ddc0196df2400e440e4bddbcc4ce32c636a7ec1 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Wed, 27 Nov 2013 00:58:39 +0100
|
|
Subject: [PATCH] journal: fix iteration when we go backwards from the
|
|
beginning of an array chain element
|
|
|
|
(cherry picked from commit e5462cd80e5328a769137c261c93931ea0c27bab)
|
|
---
|
|
src/journal/journal-file.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
|
|
index 02f7554..4e22e08 100644
|
|
--- a/src/journal/journal-file.c
|
|
+++ b/src/journal/journal-file.c
|
|
@@ -1687,7 +1687,7 @@ found:
|
|
return 0;
|
|
|
|
/* Let's cache this item for the next invocation */
|
|
- chain_cache_put(f->chain_cache, ci, first, a, array->entry_array.items[0], t, i + (subtract_one ? -1 : 0));
|
|
+ chain_cache_put(f->chain_cache, ci, first, a, array->entry_array.items[0], t, subtract_one ? (i > 0 ? i-1 : (uint64_t) -1) : i);
|
|
|
|
if (subtract_one && i == 0)
|
|
p = last_p;
|