vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

e2fsck: make a prompt message simpler and thus translatable 

It can be made simpler because there is no need to differentiate between
having an internal journal inode and having an external journal device.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
maint-test
Benno Schulenberg 2014-06-03 21:59:31 -04:00 committed by Theodore Ts'o
parent 0781e038bb
commit 1301def84c
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
e2fsck/journal.c
View File

@ -759,7 +759,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))

2
e2fsck/problem.c
View File

@ -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 is present.\n"),
PROMPT_CLEAR, PR_PREEN_OK },
/* Superblock needs_recovery flag is set but not journal is present */

2
tests/f_extra_journal/expect.1
View File

@ -1,4 +1,4 @@
Superblock has_journal flag is clear, but a journal inode is present.
Superblock has_journal flag is clear, but a journal is present.
Clear? yes
Pass 1: Checking inodes, blocks, and sizes