e2fsck: Remove "ext3" from problem descriptions of the journal

The ext4 filesystem uses journals too, so remove "ext3" from the
problem descriptions involving journals.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index 9cb3094c2efb9492c2ca2bb713b7997706fdde43..9d193c377133953fbe67da3689240c93c80c6369 100644 (file)
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -184,7 +184,7 @@ static struct e2fsck_problem problem_table[] = {
 
        /* Journal inode is invalid */
        { PR_0_JOURNAL_BAD_INODE,
-         N_("@S has an @n ext3 @j (@i %i).\n"),
+         N_("@S has an @n @j (@i %i).\n"),
          PROMPT_CLEAR, PR_PREEN_OK },
 
        /* The external journal has (unsupported) multiple filesystems */
@@ -209,7 +209,7 @@ static struct e2fsck_problem problem_table[] = {
 
        /* Journal has an unknown superblock type */
        { PR_0_JOURNAL_UNSUPP_SUPER,
-         N_("Ext3 @j @S is unknown type %N (unsupported).\n"
+         N_("@f @j @S is unknown type %N (unsupported).\n"
             "It is likely that your copy of e2fsck is old and/or doesn't "
             "support this @j format.\n"
             "It is also possible the @j @S is corrupt.\n"),
@@ -217,22 +217,22 @@ static struct e2fsck_problem problem_table[] = {
 
        /* Journal superblock is corrupt */
        { PR_0_JOURNAL_BAD_SUPER,
-         N_("Ext3 @j @S is corrupt.\n"),
+         N_("@j @S is corrupt.\n"),
          PROMPT_FIX, PR_PREEN_OK },
 
-       /* Superblock flag should be cleared */
+       /* Superblock has_journal flag is clear but has a journal */
        { PR_0_JOURNAL_HAS_JOURNAL,
-         N_("@S doesn't have has_@j flag, but has ext3 @j %s.\n"),
+         N_("@S has_@j flag is clear, but a @j %s is present.\n"),
          PROMPT_CLEAR, PR_PREEN_OK },
 
-       /* Superblock flag is incorrect */
+       /* Superblock needs_recovery flag is set but not journal is present */
        { PR_0_JOURNAL_RECOVER_SET,
-         N_("@S has ext3 needs_recovery flag set, but no @j.\n"),
+         N_("@S needs_recovery flag is set, but no @j is present.\n"),
          PROMPT_CLEAR, PR_PREEN_OK },
 
-       /* Journal has data, but recovery flag is clear */
+       /* Superblock needs_recovery flag is set, but journal has data */
        { PR_0_JOURNAL_RECOVERY_CLEAR,
-         N_("ext3 recovery flag is clear, but @j has data.\n"),
+         N_("@S needs_recovery flag is clear, but @j has data.\n"),
          PROMPT_NONE, 0 },
 
        /* Ask if we should clear the journal */
@@ -282,12 +282,12 @@ static struct e2fsck_problem problem_table[] = {
 
        /* Journal superblock has an unknown read-only feature flag set */
        { PR_0_JOURNAL_UNSUPP_ROCOMPAT,
-         N_("Ext3 @j @S has an unknown read-only feature flag set.\n"),
+         N_("@j @S has an unknown read-only feature flag set.\n"),
          PROMPT_ABORT, 0 },
 
        /* Journal superblock has an unknown incompatible feature flag set */
        { PR_0_JOURNAL_UNSUPP_INCOMPAT,
-         N_("Ext3 @j @S has an unknown incompatible feature flag set.\n"),
+         N_("@j @S has an unknown incompatible feature flag set.\n"),
          PROMPT_ABORT, 0 },
 
        /* Journal has unsupported version number */
@@ -1594,8 +1594,8 @@ static struct e2fsck_problem problem_table[] = {
 
        /* Recreate journal if E2F_FLAG_JOURNAL_INODE flag is set */
        { PR_6_RECREATE_JOURNAL,
-         N_("Recreate journal to make the filesystem ext3 again?\n"),
-         PROMPT_FIX, PR_PREEN_OK | PR_NO_OK },
+         N_("Recreate @j"),
+         PROMPT_NULL, PR_PREEN_OK | PR_NO_OK },
 
        /* Group N block(s) in use but group is marked BLOCK_UNINIT */
        { PR_5_BLOCK_UNINIT,

diff --git a/tests/f_badjour_indblks/expect.1 b/tests/f_badjour_indblks/expect.1
index d80da89522957bf057ab237e81dbf37039215606..7ccc59b929c0fd84239289381acdd36895d79aea 100644 (file)
--- a/tests/f_badjour_indblks/expect.1
+++ b/tests/f_badjour_indblks/expect.1
@@ -1,4 +1,4 @@
-Superblock has an invalid ext3 journal (inode 8).
+Superblock has an invalid journal (inode 8).
 Clear? yes
 
 *** ext3 journal has been deleted - filesystem is now ext2 only ***
@@ -21,8 +21,7 @@ Fix? yes
 Free blocks count wrong (7080, counted=8110).
 Fix? yes
 
-Recreate journal to make the filesystem ext3 again?
-Fix? yes
+Recreate journal? yes
 
 Creating journal (1024 blocks):  Done.
 

diff --git a/tests/f_badjourblks/expect.1 b/tests/f_badjourblks/expect.1
index cd86fc410f3297c2412da2386dafb77798f1c478..34c6658f898028f23c03a67ed7223c776a465859 100644 (file)
--- a/tests/f_badjourblks/expect.1
+++ b/tests/f_badjourblks/expect.1
@@ -1,4 +1,4 @@
-Superblock has an invalid ext3 journal (inode 8).
+Superblock has an invalid journal (inode 8).
 Clear? yes
 
 *** ext3 journal has been deleted - filesystem is now ext2 only ***
@@ -19,8 +19,7 @@ Fix? yes
 Free blocks count wrong (7112, counted=8142).
 Fix? yes
 
-Recreate journal to make the filesystem ext3 again?
-Fix? yes
+Recreate journal? yes
 
 Creating journal (1024 blocks):  Done.
 

diff --git a/tests/f_extra_journal/expect.1 b/tests/f_extra_journal/expect.1
index f8ccd64752050ec79a6d779ebbda8097240b4a2f..8a74adb3828d1dccc268553c932bd8f844ed3eba 100644 (file)
--- a/tests/f_extra_journal/expect.1
+++ b/tests/f_extra_journal/expect.1
@@ -1,4 +1,4 @@
-Superblock doesn't have has_journal flag, but has ext3 journal inode.
+Superblock has_journal flag is clear, but a journal inode is present.
 Clear? yes
 
 Pass 1: Checking inodes, blocks, and sizes

diff --git a/tests/f_miss_journal/expect.1 b/tests/f_miss_journal/expect.1
index 7d696f8e387c47f9d4bffe07c30b7ab4839d1d42..6ec8b388dffb3a5f46b4f93d593cc09b141fc5a6 100644 (file)
--- a/tests/f_miss_journal/expect.1
+++ b/tests/f_miss_journal/expect.1
@@ -1,4 +1,4 @@
-Superblock has an invalid ext3 journal (inode 8).
+Superblock has an invalid journal (inode 8).
 Clear? yes
 
 *** ext3 journal has been deleted - filesystem is now ext2 only ***
@@ -17,8 +17,7 @@ Fix? yes
 Free blocks count wrong (968, counted=1998).
 Fix? yes
 
-Recreate journal to make the filesystem ext3 again?
-Fix? yes
+Recreate journal? yes
 
 Creating journal (1024 blocks):  Done.