summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2004-02-22 15:41:11 -0500
committerTheodore Ts'o <tytso@mit.edu>2004-02-22 15:41:11 -0500
commit151786fc556930246a9d3b3db73c956c786891a1 (patch)
treef852d9981d6330c5aaa98552afb3fab535da9fde
parent90252ca1ba946125683765db8a5c8bcd6f4f7ae8 (diff)
downloade2fsprogs-151786fc556930246a9d3b3db73c956c786891a1.tar.gz
Fix up preen mode messages during pass 1B/C/D.
-rw-r--r--e2fsck/pass1b.c9
-rw-r--r--e2fsck/problem.c4
2 files changed, 8 insertions, 5 deletions
diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c
index f368d843..6df25dcd 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 f2673724..75708b70 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,