From fba4b733319a916c55b49d6e123c3fda0e565cda Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sun, 18 Feb 2018 21:42:31 -0500 Subject: [PATCH] add patch jbd2-clarify-recovery-checksum-error-msg --- jbd2-clarify-recovery-checksum-error-msg | 27 +++++++++++++++++++++++++++ series | 1 + 2 files changed, 28 insertions(+) create mode 100644 jbd2-clarify-recovery-checksum-error-msg diff --git a/jbd2-clarify-recovery-checksum-error-msg b/jbd2-clarify-recovery-checksum-error-msg new file mode 100644 index 00000000..97ab9d22 --- /dev/null +++ b/jbd2-clarify-recovery-checksum-error-msg @@ -0,0 +1,27 @@ +jbd2: clarify bad journal block checksum message + +There were two error messages emitted by jbd2, one for a bad checksum +for a jbd2 descriptor block, and one for a bad checksum for a jbd2 +data block. Change the data block checksum error so that the two can +be disambiguated. + +Signed-off-by: Theodore Ts'o +--- + fs/jbd2/recovery.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c +index f99910b69c78..a4967b27ffb6 100644 +--- a/fs/jbd2/recovery.c ++++ b/fs/jbd2/recovery.c +@@ -600,8 +600,8 @@ static int do_one_pass(journal_t *journal, + success = -EFSBADCRC; + printk(KERN_ERR "JBD2: Invalid " + "checksum recovering " +- "block %llu in log\n", +- blocknr); ++ "data block %llu in " ++ "log\n", blocknr); + block_error = 1; + goto skip_write; + } diff --git a/series b/series index 998b2f74..37cc3e45 100644 --- a/series +++ b/series @@ -1,6 +1,7 @@ # v4.16-rc1 add-ext4_shutdown-tracepoint +jbd2-clarify-recovery-checksum-error-msg #################################################### # unstable patches -- 2.11.4.GIT