From: Darrick J. Wong Date: Wed, 3 Dec 2014 05:01:44 +0000 (-0500) Subject: e2fsck: remove 'invalid' wording from error when extent block fails checksum X-Git-Tag: v1.43-WIP-2015-05-18~126 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a93a90d2ae93312d74638994988cc552408ed552;p=thirdparty%2Fe2fsprogs.git e2fsck: remove 'invalid' wording from error when extent block fails checksum Don't say the physical block number is invalid if an extent block fails only the checksum. It passes checks, so it's not invalid. Signed-off-by: Darrick J. Wong Signed-off-by: Theodore Ts'o --- diff --git a/e2fsck/problem.c b/e2fsck/problem.c index a4da64b1d..a63e61cf1 100644 --- a/e2fsck/problem.c +++ b/e2fsck/problem.c @@ -998,7 +998,7 @@ static struct e2fsck_problem problem_table[] = { */ { PR_1_EXTENT_ONLY_CSUM_INVALID, N_("@i %i extent block passes checks, but checksum does not match " - "extent\n\t(logical @b %c, @n physical @b %b, len %N)\n"), + "extent\n\t(logical @b %c, physical @b %b, len %N)\n"), PROMPT_FIX, 0 }, /* diff --git a/tests/f_extent_int_bad_csum/expect.1 b/tests/f_extent_int_bad_csum/expect.1 index 57a2a614a..7b412b8a2 100644 --- a/tests/f_extent_int_bad_csum/expect.1 +++ b/tests/f_extent_int_bad_csum/expect.1 @@ -1,6 +1,6 @@ Pass 1: Checking inodes, blocks, and sizes Inode 12 extent block passes checks, but checksum does not match extent - (logical block 698, invalid physical block 1788, len 1) + (logical block 698, physical block 1788, len 1) Fix? yes Pass 2: Checking directory structure diff --git a/tests/f_extent_leaf_bad_csum/expect.1 b/tests/f_extent_leaf_bad_csum/expect.1 index 0dc78ad2f..86e501a70 100644 --- a/tests/f_extent_leaf_bad_csum/expect.1 +++ b/tests/f_extent_leaf_bad_csum/expect.1 @@ -1,6 +1,6 @@ Pass 1: Checking inodes, blocks, and sizes Inode 12 extent block passes checks, but checksum does not match extent - (logical block 7, invalid physical block 1090, len 1) + (logical block 7, physical block 1090, len 1) Fix? yes Pass 2: Checking directory structure