Message ID | 1401738524-11455-2-git-send-email-bensberg@justemail.net |
---|---|
State | Superseded, archived |
Headers | show |
On Mon, Jun 02, 2014 at 09:48:42PM +0200, Benno Schulenberg wrote: > Signed-off-by: Benno Schulenberg <bensberg@justemail.net> > --- > e2fsck/journal.c | 1 - > e2fsck/problem.c | 2 +- > 2 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/e2fsck/journal.c b/e2fsck/journal.c > index a7b1150..a3b3967 100644 > --- a/e2fsck/journal.c > +++ b/e2fsck/journal.c > @@ -820,7 +820,6 @@ errcode_t e2fsck_check_ext3_journal(e2fsck_t ctx) > no_has_journal: > if (!(sb->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL)) { > recover = sb->s_feature_incompat & EXT3_FEATURE_INCOMPAT_RECOVER; > - pctx.str = "inode"; > if (fix_problem(ctx, PR_0_JOURNAL_HAS_JOURNAL, &pctx)) { > if (recover && > !fix_problem(ctx, PR_0_JOURNAL_RECOVER_SET, &pctx)) > diff --git a/e2fsck/problem.c b/e2fsck/problem.c > index 2b564a8..e393417 100644 > --- a/e2fsck/problem.c > +++ b/e2fsck/problem.c > @@ -225,7 +225,7 @@ static struct e2fsck_problem problem_table[] = { > > /* Superblock has_journal flag is clear but has a journal */ > { PR_0_JOURNAL_HAS_JOURNAL, > - N_("@S has_@j flag is clear, but a @j %s is present.\n"), > + N_("@S has_@j flag is clear, but a @j @i is present.\n"), It's probably better to just make this read "but a journal is present". The reason why we were doing the fill-in word was because the intent was to be able to make the distinction between a journal inode and an external journal device. The intent was never realied, and at this point it's better to just take out the specifity of whether we are using a journal inode or a journal device. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/e2fsck/journal.c b/e2fsck/journal.c index a7b1150..a3b3967 100644 --- a/e2fsck/journal.c +++ b/e2fsck/journal.c @@ -820,7 +820,6 @@ errcode_t e2fsck_check_ext3_journal(e2fsck_t ctx) no_has_journal: if (!(sb->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL)) { recover = sb->s_feature_incompat & EXT3_FEATURE_INCOMPAT_RECOVER; - pctx.str = "inode"; if (fix_problem(ctx, PR_0_JOURNAL_HAS_JOURNAL, &pctx)) { if (recover && !fix_problem(ctx, PR_0_JOURNAL_RECOVER_SET, &pctx)) diff --git a/e2fsck/problem.c b/e2fsck/problem.c index 2b564a8..e393417 100644 --- a/e2fsck/problem.c +++ b/e2fsck/problem.c @@ -225,7 +225,7 @@ static struct e2fsck_problem problem_table[] = { /* Superblock has_journal flag is clear but has a journal */ { PR_0_JOURNAL_HAS_JOURNAL, - N_("@S has_@j flag is clear, but a @j %s is present.\n"), + N_("@S has_@j flag is clear, but a @j @i is present.\n"), PROMPT_CLEAR, PR_PREEN_OK }, /* Superblock needs_recovery flag is set but not journal is present */
Signed-off-by: Benno Schulenberg <bensberg@justemail.net> --- e2fsck/journal.c | 1 - e2fsck/problem.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-)