X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-file.c;h=4de1daf6a0b177bed7105fc32ea493cc8da4a95c;hb=fd8ee359a014916ac62ae2b58f6736ccb48c6d4e;hp=977cfa1010f8a57ae057a4b3412e65c907368d0a;hpb=4bbdcdb301f8ef6f8b9e943210ab61250003c517;p=elogind.git diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index 977cfa101..4de1daf6a 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -332,11 +332,11 @@ static int journal_file_move_to(JournalFile *f, int wt, uint64_t offset, uint64_ delta = PAGE_ALIGN((DEFAULT_WINDOW_SIZE - size) / 2); - if (offset < delta) + if (delta > offset) delta = offset; offset -= delta; - size += (DEFAULT_WINDOW_SIZE - delta); + size = DEFAULT_WINDOW_SIZE; } else delta = 0; @@ -1016,9 +1016,6 @@ int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const st ts->monotonic < le64toh(f->header->tail_entry_monotonic)) return -EINVAL; - if (ts->realtime < le64toh(f->header->tail_entry_realtime)) - return -EINVAL; - items = alloca(sizeof(EntryItem) * n_iovec); for (i = 0; i < n_iovec; i++) {