From 37b6b2975f5f2422c26f1598a23253df76f02814 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 12 Jan 2001 21:16:13 +0000 Subject: [PATCH] ChangeLog, problem.c: problem.c: For PR_1_RESERVED_BAD_MODE, print a description of the reserved inode. In PR_0_JOURNAL_HAS_JOURNAL, prompt to clear the journal, rather than deleting it (which is more accurate). (From Andreas Dilger.) --- e2fsck/ChangeLog | 5 +++++ e2fsck/problem.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog index 43a4daac..594ca91d 100644 --- a/e2fsck/ChangeLog +++ b/e2fsck/ChangeLog @@ -1,5 +1,10 @@ 2001-01-12 Theodore Ts'o + * problem.c: For PR_1_RESERVED_BAD_MODE, print a description of + the reserved inode. In PR_0_JOURNAL_HAS_JOURNAL, prompt + to clear the journal, rather than deleting it (which is + more accurate). (From Andreas Dilger.) + * journal.c: Make sure all functions which return an error code use the errcode_t return type, and not "int" (e2fsck_journal_release): Add new parameter, "drop", diff --git a/e2fsck/problem.c b/e2fsck/problem.c index ac4493ad..46b041ed 100644 --- a/e2fsck/problem.c +++ b/e2fsck/problem.c @@ -212,7 +212,7 @@ static const struct e2fsck_problem problem_table[] = { /* Superblock flag should be cleared */ { PR_0_JOURNAL_HAS_JOURNAL, N_("@S doesn't have has_journal flag, but has ext3 @j %s.\n"), - PROMPT_DELETE, PR_PREEN_OK }, + PROMPT_CLEAR, PR_PREEN_OK }, /* Superblock flag is incorrect */ { PR_0_JOURNAL_RECOVER_SET, @@ -277,7 +277,7 @@ static const struct e2fsck_problem problem_table[] = { /* Reserved inode has bad mode */ { PR_1_RESERVED_BAD_MODE, - N_("Reserved @i %i has bad mode. "), + N_("Reserved @i %i %Q has bad mode. "), PROMPT_CLEAR, PR_PREEN_OK }, /* Deleted inode has zero dtime */