Whamcloud - gitweb
e2fsck: make a prompt message simpler and thus translatable
authorBenno Schulenberg <bensberg@justemail.net>
Wed, 4 Jun 2014 01:59:31 +0000 (21:59 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Wed, 4 Jun 2014 02:04:28 +0000 (22:04 -0400)
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>
e2fsck/journal.c
e2fsck/problem.c
tests/f_extra_journal/expect.1

index 11ccec5..905c0bf 100644 (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))
index 2296c97..c721d9d 100644 (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 */
index 8a74adb..4917396 100644 (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