Commit c4aff78b authored by Lennart Poettering's avatar Lennart Poettering
Browse files

journal: fix interleaving of files with different time sources

parent 474abe33
...@@ -240,7 +240,7 @@ static int compare_order(JournalFile *af, Object *ao, ...@@ -240,7 +240,7 @@ static int compare_order(JournalFile *af, Object *ao,
/* Otherwise compare UTC time */ /* Otherwise compare UTC time */
a = le64toh(ao->entry.realtime); a = le64toh(ao->entry.realtime);
b = le64toh(ao->entry.realtime); b = le64toh(bo->entry.realtime);
if (a < b) if (a < b)
return -1; return -1;
...@@ -249,7 +249,7 @@ static int compare_order(JournalFile *af, Object *ao, ...@@ -249,7 +249,7 @@ static int compare_order(JournalFile *af, Object *ao,
/* Finally, compare by contents */ /* Finally, compare by contents */
a = le64toh(ao->entry.xor_hash); a = le64toh(ao->entry.xor_hash);
b = le64toh(ao->entry.xor_hash); b = le64toh(bo->entry.xor_hash);
if (a < b) if (a < b)
return -1; return -1;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment