From 7e92dfae9e60947a20a2078b7871b073441dac44 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 12 Jan 2001 15:30:25 +0000 Subject: [PATCH] ChangeLog, journal.c, problem.c: journal.c (e2fsck_journal_fix_bad_inode): Set pctx->ino to the bad journal number. problem.c (PR_0_JOURNAL_BAD_INODE): Use pctx->ino instead of pctx->num when printing the bad journal inode number. --- e2fsck/ChangeLog | 8 ++++++++ e2fsck/journal.c | 1 + e2fsck/problem.c | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog index c5f4d16..79e32c4 100644 --- a/e2fsck/ChangeLog +++ b/e2fsck/ChangeLog @@ -1,3 +1,11 @@ +2001-01-12 Theodore Ts'o + + * journal.c (e2fsck_journal_fix_bad_inode): Set pctx->ino to the + bad journal number. + + * problem.c (PR_0_JOURNAL_BAD_INODE): Use pctx->ino instead of + pctx->num when printing the bad journal inode number. + 2001-01-11 * pass1.c (process_block): Remove dead code which was never diff --git a/e2fsck/journal.c b/e2fsck/journal.c index d350c0c..8b49e9c 100644 --- a/e2fsck/journal.c +++ b/e2fsck/journal.c @@ -270,6 +270,7 @@ static int e2fsck_journal_fix_bad_inode(e2fsck_t ctx, if (has_journal || sb->s_journal_inum) { /* The journal inode is bogus, remove and force full fsck */ + pctx->ino = sb->s_journal_inum; if (fix_problem(ctx, PR_0_JOURNAL_BAD_INODE, pctx)) { if (has_journal && sb->s_journal_inum) printf("*** ext3 journal has been deleted - " diff --git a/e2fsck/problem.c b/e2fsck/problem.c index 3accd28..ac4493a 100644 --- a/e2fsck/problem.c +++ b/e2fsck/problem.c @@ -176,7 +176,7 @@ static const struct e2fsck_problem problem_table[] = { /* Journal inode is invalid */ { PR_0_JOURNAL_BAD_INODE, - N_("@S has a bad ext3 @j (@i %N).\n"), + N_("@S has a bad ext3 @j (@i %i).\n"), PROMPT_CLEAR, PR_PREEN_OK }, /* Superblock has a journal device (which we can't handle yet) */ -- 1.8.3.1