diff --git a/e2fsck/journal.c b/e2fsck/journal.c index 6119cda6..9f320952 100644 --- a/e2fsck/journal.c +++ b/e2fsck/journal.c @@ -545,8 +545,7 @@ static errcode_t e2fsck_journal_fix_bad_inode(e2fsck_t ctx, 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 - " - "filesystem is now ext2 only ***\n\n"); + printf("*** journal has been deleted ***\n\n"); sb->s_feature_compat &= ~EXT3_FEATURE_COMPAT_HAS_JOURNAL; sb->s_journal_inum = 0; memset(sb->s_jnl_blocks, 0, sizeof(sb->s_jnl_blocks)); diff --git a/e2fsck/unix.c b/e2fsck/unix.c index 615d6906..96551a13 100644 --- a/e2fsck/unix.c +++ b/e2fsck/unix.c @@ -1674,8 +1674,7 @@ print_unsupp_features: } log_out(ctx, "%s", _(" Done.\n")); log_out(ctx, "%s", - _("\n*** journal has been re-created - " - "filesystem is now ext3 again ***\n")); + _("\n*** journal has been regenerated ***\n")); } } no_journal: diff --git a/tests/f_badjour_indblks/expect.1 b/tests/f_badjour_indblks/expect.1 index 7ccc59b9..cb8054cf 100644 --- a/tests/f_badjour_indblks/expect.1 +++ b/tests/f_badjour_indblks/expect.1 @@ -1,7 +1,7 @@ Superblock has an invalid journal (inode 8). Clear? yes -*** ext3 journal has been deleted - filesystem is now ext2 only *** +*** journal has been deleted *** Adding dirhash hint to filesystem. @@ -25,7 +25,7 @@ Recreate journal? yes Creating journal (1024 blocks): Done. -*** journal has been re-created - filesystem is now ext3 again *** +*** journal has been regenerated *** test_filesys: ***** FILE SYSTEM WAS MODIFIED ***** test_filesys: 11/256 files (0.0% non-contiguous), 1111/8192 blocks diff --git a/tests/f_badjourblks/expect.1 b/tests/f_badjourblks/expect.1 index 34c6658f..5483a0d5 100644 --- a/tests/f_badjourblks/expect.1 +++ b/tests/f_badjourblks/expect.1 @@ -1,7 +1,7 @@ Superblock has an invalid journal (inode 8). Clear? yes -*** ext3 journal has been deleted - filesystem is now ext2 only *** +*** journal has been deleted *** Pass 1: Checking inodes, blocks, and sizes Journal inode is not in use, but contains data. Clear? yes @@ -23,7 +23,7 @@ Recreate journal? yes Creating journal (1024 blocks): Done. -*** journal has been re-created - filesystem is now ext3 again *** +*** journal has been regenerated *** test_filesys: ***** FILE SYSTEM WAS MODIFIED ***** test_filesys: 11/256 files (0.0% non-contiguous), 1079/8192 blocks diff --git a/tests/f_jnl_etb_alloc_fail/expect.1 b/tests/f_jnl_etb_alloc_fail/expect.1 index 8f4ebbbd..243a1519 100644 --- a/tests/f_jnl_etb_alloc_fail/expect.1 +++ b/tests/f_jnl_etb_alloc_fail/expect.1 @@ -1,7 +1,7 @@ Superblock has an invalid journal (inode 8). Clear? yes -*** ext3 journal has been deleted - filesystem is now ext2 only *** +*** journal has been deleted *** Superblock has_journal flag is clear, but a journal is present. Clear? yes diff --git a/tests/f_miss_journal/expect.1 b/tests/f_miss_journal/expect.1 index 6ec8b388..d435952d 100644 --- a/tests/f_miss_journal/expect.1 +++ b/tests/f_miss_journal/expect.1 @@ -1,7 +1,7 @@ Superblock has an invalid journal (inode 8). Clear? yes -*** ext3 journal has been deleted - filesystem is now ext2 only *** +*** journal has been deleted *** Pass 1: Checking inodes, blocks, and sizes Pass 2: Checking directory structure @@ -21,7 +21,7 @@ Recreate journal? yes Creating journal (1024 blocks): Done. -*** journal has been re-created - filesystem is now ext3 again *** +*** journal has been regenerated *** test_filesys: ***** FILE SYSTEM WAS MODIFIED ***** test_filesys: 11/256 files (0.0% non-contiguous), 1079/2048 blocks diff --git a/tests/j_corrupt_sb_magic/expect b/tests/j_corrupt_sb_magic/expect index 2169a153..d1dae888 100644 --- a/tests/j_corrupt_sb_magic/expect +++ b/tests/j_corrupt_sb_magic/expect @@ -1,7 +1,7 @@ Superblock has an invalid journal (inode 8). Clear? yes -*** ext3 journal has been deleted - filesystem is now ext2 only *** +*** journal has been deleted *** Superblock has_journal flag is clear, but a journal is present. Clear? yes @@ -26,7 +26,7 @@ Recreate journal? yes Creating journal (1024 blocks): Done. -*** journal has been re-created - filesystem is now ext3 again *** +*** journal has been regenerated *** test_filesys: ***** FILE SYSTEM WAS MODIFIED ***** test_filesys: 12/128 files (0.0% non-contiguous), 1092/2048 blocks diff --git a/tests/j_long_trans/expect b/tests/j_long_trans/expect index 7638ef11..7a175414 100644 --- a/tests/j_long_trans/expect +++ b/tests/j_long_trans/expect @@ -57,7 +57,7 @@ test_filesys: recovering journal Superblock has an invalid journal (inode 8). Clear? yes -*** ext3 journal has been deleted - filesystem is now ext2 only *** +*** journal has been deleted *** Resize inode not valid. Recreate? yes @@ -100,7 +100,7 @@ Recreate journal? yes Creating journal (8192 blocks): Done. -*** journal has been re-created - filesystem is now ext3 again *** +*** journal has been regenerated *** test_filesys: ***** FILE SYSTEM WAS MODIFIED ***** test_filesys: 11/16384 files (0.0% non-contiguous), 14420/262144 blocks diff --git a/tests/j_long_trans_mcsum_32bit/expect b/tests/j_long_trans_mcsum_32bit/expect index 0d141c10..a808d9f4 100644 --- a/tests/j_long_trans_mcsum_32bit/expect +++ b/tests/j_long_trans_mcsum_32bit/expect @@ -93,7 +93,7 @@ test_filesys: recovering journal Superblock has an invalid journal (inode 8). Clear? yes -*** ext3 journal has been deleted - filesystem is now ext2 only *** +*** journal has been deleted *** Resize inode not valid. Recreate? yes @@ -139,7 +139,7 @@ Recreate journal? yes Creating journal (16384 blocks): Done. -*** journal has been re-created - filesystem is now ext3 again *** +*** journal has been regenerated *** test_filesys: ***** FILE SYSTEM WAS MODIFIED ***** test_filesys: 11/32768 files (0.0% non-contiguous), 27039/524288 blocks diff --git a/tests/j_long_trans_mcsum_64bit/expect b/tests/j_long_trans_mcsum_64bit/expect index 94e99253..76e109a4 100644 --- a/tests/j_long_trans_mcsum_64bit/expect +++ b/tests/j_long_trans_mcsum_64bit/expect @@ -92,7 +92,7 @@ test_filesys: recovering journal Superblock has an invalid journal (inode 8). Clear? yes -*** ext3 journal has been deleted - filesystem is now ext2 only *** +*** journal has been deleted *** Resize inode not valid. Recreate? yes @@ -138,7 +138,7 @@ Recreate journal? yes Creating journal (16384 blocks): Done. -*** journal has been re-created - filesystem is now ext3 again *** +*** journal has been regenerated *** test_filesys: ***** FILE SYSTEM WAS MODIFIED ***** test_filesys: 11/32768 files (0.0% non-contiguous), 27057/524288 blocks