33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
|
From ae1d412f96829802688194e6957f75d37da9d7e9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||
|
|
Date: Sun, 30 Mar 2014 14:20:34 -0400
|
||
|
|
Subject: [PATCH] journal: allow files with no data whatsoever
|
||
|
|
|
||
|
|
If a file was opened for writing, and then closed immediately without
|
||
|
|
actually writing any entries, on subsequent opening, it would be
|
||
|
|
considered "corrupted". This should be totally fine, and even in
|
||
|
|
read mode, an empty file can become non-empty later on.
|
||
|
|
|
||
|
|
(cherry picked from commit b3306e9c3c1e036396bc6bf74555eecea3f45ad9)
|
||
|
|
---
|
||
|
|
src/journal/journal-file.c | 6 ------
|
||
|
|
1 file changed, 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
|
||
|
|
index b3b1ffc3c0..ef54af4558 100644
|
||
|
|
--- a/src/journal/journal-file.c
|
||
|
|
+++ b/src/journal/journal-file.c
|
||
|
|
@@ -271,12 +271,6 @@ static int journal_file_verify_header(JournalFile *f) {
|
||
|
|
!VALID64(le64toh(f->header->entry_array_offset)))
|
||
|
|
return -ENODATA;
|
||
|
|
|
||
|
|
- if (le64toh(f->header->data_hash_table_offset) < le64toh(f->header->header_size) ||
|
||
|
|
- le64toh(f->header->field_hash_table_offset) < le64toh(f->header->header_size) ||
|
||
|
|
- le64toh(f->header->tail_object_offset) < le64toh(f->header->header_size) ||
|
||
|
|
- le64toh(f->header->entry_array_offset) < le64toh(f->header->header_size))
|
||
|
|
- return -ENODATA;
|
||
|
|
-
|
||
|
|
if (f->writable) {
|
||
|
|
uint8_t state;
|
||
|
|
sd_id128_t machine_id;
|