From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: tytso@mit.edu, darrick.wong@oracle.com
Cc: linux-ext4@vger.kernel.org
Subject: [PATCH 08/18] e2fsck: fix the various checksum error messages
Date: Fri, 25 Jul 2014 17:34:28 -0700 [thread overview]
Message-ID: <20140726003428.28334.68886.stgit@birch.djwong.org> (raw)
In-Reply-To: <20140726003339.28334.54447.stgit@birch.djwong.org>
Make the "EA block passes checks but fails checksum" message less
strange, and make the other checksum error messages actually print a
period at the end of the sentence.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
e2fsck/problem.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index a56511a..8440052 100644
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -992,19 +992,17 @@ static struct e2fsck_problem problem_table[] = {
"extent\n\t(logical @b %c, @n physical @b %b, len %N)\n"),
PROMPT_FIX, 0 },
- /* Extended attribute block checksum for inode does not match. */
+ /* Inode extended attribute block checksum does not match block. */
{ PR_1_EA_BLOCK_CSUM_INVALID,
- N_("Extended attribute @a @b %b checksum for @i %i does not "
- "match. "),
+ N_("@i %i @a @b %b checksum does not match block. "),
PROMPT_CLEAR, PR_INITIAL_CSUM },
/*
- * Extended attribute block passes checks, but checksum for inode does
- * not match.
+ * Inode extended attribute block passes checks, but checksum does not
+ * match block.
*/
{ PR_1_EA_BLOCK_ONLY_CSUM_INVALID,
- N_("Extended attribute @a @b %b passes checks, but checksum for "
- "@i %i does not match. "),
+ N_("@i %i @a @b %b passes checks, but checksum does not match block. "),
PROMPT_FIX, 0 },
/*
@@ -1482,27 +1480,27 @@ static struct e2fsck_problem problem_table[] = {
/* htree root node fails checksum */
{ PR_2_HTREE_ROOT_CSUM_INVALID,
- N_("@p @h %d: root node fails checksum\n"),
+ N_("@p @h %d: root node fails checksum.\n"),
PROMPT_CLEAR_HTREE, PR_PREEN_OK },
/* htree internal node fails checksum */
{ PR_2_HTREE_NODE_CSUM_INVALID,
- N_("@p @h %d: internal node fails checksum\n"),
+ N_("@p @h %d: internal node fails checksum.\n"),
PROMPT_CLEAR_HTREE, PR_PREEN_OK },
/* leaf node fails checksum */
{ PR_2_LEAF_NODE_CSUM_INVALID,
- N_("@d @i %i, %B, offset %N: @d fails checksum\n"),
+ N_("@d @i %i, %B, offset %N: @d fails checksum.\n"),
PROMPT_SALVAGE, PR_PREEN_OK | PR_INITIAL_CSUM },
/* leaf node has no checksum */
{ PR_2_LEAF_NODE_MISSING_CSUM,
- N_("@d @i %i, %B, offset %N: @d has no checksum\n"),
+ N_("@d @i %i, %B, offset %N: @d has no checksum.\n"),
PROMPT_FIX, PR_PREEN_OK },
/* leaf node passes checks but fails checksum */
{ PR_2_LEAF_NODE_ONLY_CSUM_INVALID,
- N_("@d @i %i, %B, offset %N: @d passes checks but fails checksum\n"),
+ N_("@d @i %i, %B, offset %N: @d passes checks but fails checksum.\n"),
PROMPT_FIX, PR_PREEN_OK },
/* Pass 3 errors */
@@ -1828,12 +1826,12 @@ static struct e2fsck_problem problem_table[] = {
/* Group N inode bitmap does not match checksum */
{ PR_5_INODE_BITMAP_CSUM_INVALID,
- N_("@g %g @i bitmap does not match checksum\n"),
+ N_("@g %g @i bitmap does not match checksum.\n"),
PROMPT_FIX, PR_LATCH_IBITMAP | PR_PREEN_OK },
/* Group N block bitmap does not match checksum */
{ PR_5_BLOCK_BITMAP_CSUM_INVALID,
- N_("@g %g @b bitmap does not match checksum\n"),
+ N_("@g %g @b bitmap does not match checksum.\n"),
PROMPT_FIX, PR_LATCH_BBITMAP | PR_PREEN_OK },
/* Post-Pass 5 errors */
next prev parent reply other threads:[~2014-07-26 0:34 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-26 0:33 [PATCH 00/18] e2fsprogs patchbomb 7/14, part 2 Darrick J. Wong
2014-07-26 0:33 ` [PATCH 01/18] e2fsck: reserve blocks for root/lost+found directory repair Darrick J. Wong
2014-07-26 19:47 ` Theodore Ts'o
2014-07-28 7:27 ` Darrick J. Wong
2014-07-26 0:33 ` [PATCH 02/18] e2fsck: fix merge error in "clear uninit flag on directory extents" Darrick J. Wong
2014-07-26 20:04 ` Theodore Ts'o
2014-07-26 0:33 ` [PATCH 03/18] e2fsck: perform implied cluster allocations when filling a directory hole Darrick J. Wong
2014-07-26 20:08 ` Theodore Ts'o
2014-07-26 0:34 ` [PATCH 04/18] e2fsck: fix rule-violating lblk->pblk mappings on bigalloc filesystems Darrick J. Wong
2014-07-26 6:02 ` Andreas Dilger
2014-07-26 20:27 ` Theodore Ts'o
2014-07-28 8:28 ` Darrick J. Wong
2014-07-28 17:55 ` Darrick J. Wong
2014-07-28 19:32 ` Theodore Ts'o
2014-07-26 0:34 ` [PATCH 05/18] e2fsck: during pass1b delete_file, only free a cluster once Darrick J. Wong
2014-07-26 20:30 ` Theodore Ts'o
2014-07-26 0:34 ` [PATCH 06/18] dumpe2fs: add switch to disable checksum verification Darrick J. Wong
2014-07-26 20:58 ` Theodore Ts'o
2014-07-28 7:48 ` Darrick J. Wong
2014-07-26 0:34 ` [PATCH 07/18] e2fsck: verify checksums after checking everything else Darrick J. Wong
2014-07-26 20:53 ` Theodore Ts'o
2014-07-28 8:27 ` Darrick J. Wong
2014-07-26 0:34 ` Darrick J. Wong [this message]
2014-07-26 21:09 ` [PATCH 08/18] e2fsck: fix the various checksum error messages Theodore Ts'o
2014-07-28 7:57 ` Darrick J. Wong
2014-07-26 0:34 ` [PATCH 09/18] e2fsck: insert a missing dirent tail for checksums if possible Darrick J. Wong
2014-07-26 21:13 ` Theodore Ts'o
2014-07-26 0:34 ` [PATCH 10/18] e2fsck: write dir blocks after new inode when reconstructing root/lost+found Darrick J. Wong
2014-07-26 21:18 ` Theodore Ts'o
2014-07-26 0:34 ` [PATCH 11/18] libext2/fsck: correctly preserve fs flags when modifying ignore-csum-error flag Darrick J. Wong
2014-07-27 23:27 ` Theodore Ts'o
2014-07-28 8:06 ` Darrick J. Wong
2014-07-26 0:34 ` [PATCH 12/18] e2fsck: toggle checksum verification error reporting appropriately Darrick J. Wong
2014-07-27 23:37 ` Theodore Ts'o
2014-07-28 7:38 ` Darrick J. Wong
2014-07-28 11:41 ` Theodore Ts'o
2014-07-26 0:34 ` [PATCH 13/18] libext2fs: Don't cache inodes that fail checksum verification Darrick J. Wong
2014-07-26 0:35 ` [PATCH 14/18] e2fsck: always recheck an inode checksum failure Darrick J. Wong
2014-07-26 0:35 ` [PATCH 15/18] e2fsck: clear badblocks inode when checksum fails Darrick J. Wong
2014-07-27 23:42 ` Theodore Ts'o
2014-07-26 0:35 ` [PATCH 16/18] e2fsck: leave room for checksum structure when salvaging a directory Darrick J. Wong
2014-07-27 23:45 ` Theodore Ts'o
2014-07-26 0:35 ` [PATCH 17/18] e2fsck: make insert_dirent_tail more robust Darrick J. Wong
2014-07-27 23:48 ` Theodore Ts'o
2014-07-26 0:35 ` [PATCH 18/18] e2fsck: don't offer to fix the checksum of fixed extents Darrick J. Wong
2014-07-27 23:52 ` Theodore Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140726003428.28334.68886.stgit@birch.djwong.org \
--to=darrick.wong@oracle.com \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).