From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 22 Feb 2004 20:41:11 +0000 (-0500)
Subject: Fix up preen mode messages during pass 1B/C/D.
X-Git-Tag: E2FSPROGS-1_35~14
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=151786fc556930246a9d3b3db73c956c786891a1;p=tools%2Fe2fsprogs.git

Fix up preen mode messages during pass 1B/C/D.
---

diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c
index f368d84..6df25dc 100644
--- a/e2fsck/pass1b.c
+++ b/e2fsck/pass1b.c
@@ -248,7 +248,8 @@ static void pass1b(e2fsck_t ctx, char *block_buf)
 	
 	clear_problem_context(&pctx);
 	
-	fix_problem(ctx, PR_1B_PASS_HEADER, &pctx);
+	if (!(ctx->options & E2F_OPT_PREEN))
+		fix_problem(ctx, PR_1B_PASS_HEADER, &pctx);
 	pctx.errcode = ext2fs_open_inode_scan(fs, ctx->inode_buffer_blocks,
 					      &scan);
 	if (pctx.errcode) {
@@ -382,7 +383,8 @@ static void pass1c(e2fsck_t ctx, char *block_buf)
 
 	clear_problem_context(&pctx);
 
-	fix_problem(ctx, PR_1C_PASS_HEADER, &pctx);
+	if (!(ctx->options & E2F_OPT_PREEN))
+		fix_problem(ctx, PR_1C_PASS_HEADER, &pctx);
 
 	/*
 	 * Search through all directories to translate inodes to names
@@ -412,7 +414,8 @@ static void pass1d(e2fsck_t ctx, char *block_buf)
 	
 	clear_problem_context(&pctx);
 	
-	fix_problem(ctx, PR_1D_PASS_HEADER, &pctx);
+	if (!(ctx->options & E2F_OPT_PREEN))
+		fix_problem(ctx, PR_1D_PASS_HEADER, &pctx);
 	e2fsck_read_bitmaps(ctx);
 
 	pctx.num = dup_inode_count; /* dict_count(&ino_dict); */
diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index f267372..75708b7 100644
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -724,12 +724,12 @@ static const struct e2fsck_problem problem_table[] = {
 	/* Duplicate/bad block(s) in inode */
 	{ PR_1B_DUP_BLOCK,	  
 	  " %b",
-	  PROMPT_NONE, PR_LATCH_DBLOCK },
+	  PROMPT_NONE, PR_LATCH_DBLOCK | PR_PREEN_NOHDR },
 
 	/* Duplicate/bad block(s) end */
 	{ PR_1B_DUP_BLOCK_END,
 	  "\n",
-	  PROMPT_NONE, 0 },
+	  PROMPT_NONE, PR_PREEN_NOHDR },
 		  
 	/* Error while scanning inodes */
 	{ PR_1B_ISCAN_ERROR,