mirror of https://github.com/vitalif/e2fsprogs
e2fsck: fix message when the journal is deleted and regenerated
When we recreate the journal, don't say that the FS "is now ext3 again", since we could be fixing a damaged ext4 FS journal, which does not magically convert the FS back to ext3. [ Use "journaled" instead of "journalled", and also fix the message we print when deleting the journal --Ted ] Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>crypto
parent
fac0c8ead8
commit
b151d346d4
|
@ -545,8 +545,7 @@ static errcode_t e2fsck_journal_fix_bad_inode(e2fsck_t ctx,
|
||||||
pctx->ino = sb->s_journal_inum;
|
pctx->ino = sb->s_journal_inum;
|
||||||
if (fix_problem(ctx, PR_0_JOURNAL_BAD_INODE, pctx)) {
|
if (fix_problem(ctx, PR_0_JOURNAL_BAD_INODE, pctx)) {
|
||||||
if (has_journal && sb->s_journal_inum)
|
if (has_journal && sb->s_journal_inum)
|
||||||
printf("*** ext3 journal has been deleted - "
|
printf("*** journal has been deleted ***\n\n");
|
||||||
"filesystem is now ext2 only ***\n\n");
|
|
||||||
sb->s_feature_compat &= ~EXT3_FEATURE_COMPAT_HAS_JOURNAL;
|
sb->s_feature_compat &= ~EXT3_FEATURE_COMPAT_HAS_JOURNAL;
|
||||||
sb->s_journal_inum = 0;
|
sb->s_journal_inum = 0;
|
||||||
memset(sb->s_jnl_blocks, 0, sizeof(sb->s_jnl_blocks));
|
memset(sb->s_jnl_blocks, 0, sizeof(sb->s_jnl_blocks));
|
||||||
|
|
|
@ -1674,8 +1674,7 @@ print_unsupp_features:
|
||||||
}
|
}
|
||||||
log_out(ctx, "%s", _(" Done.\n"));
|
log_out(ctx, "%s", _(" Done.\n"));
|
||||||
log_out(ctx, "%s",
|
log_out(ctx, "%s",
|
||||||
_("\n*** journal has been re-created - "
|
_("\n*** journal has been regenerated ***\n"));
|
||||||
"filesystem is now ext3 again ***\n"));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
no_journal:
|
no_journal:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
Superblock has an invalid journal (inode 8).
|
Superblock has an invalid journal (inode 8).
|
||||||
Clear? yes
|
Clear? yes
|
||||||
|
|
||||||
*** ext3 journal has been deleted - filesystem is now ext2 only ***
|
*** journal has been deleted ***
|
||||||
|
|
||||||
Adding dirhash hint to filesystem.
|
Adding dirhash hint to filesystem.
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ Recreate journal? yes
|
||||||
|
|
||||||
Creating journal (1024 blocks): Done.
|
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: ***** FILE SYSTEM WAS MODIFIED *****
|
||||||
test_filesys: 11/256 files (0.0% non-contiguous), 1111/8192 blocks
|
test_filesys: 11/256 files (0.0% non-contiguous), 1111/8192 blocks
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
Superblock has an invalid journal (inode 8).
|
Superblock has an invalid journal (inode 8).
|
||||||
Clear? yes
|
Clear? yes
|
||||||
|
|
||||||
*** ext3 journal has been deleted - filesystem is now ext2 only ***
|
*** journal has been deleted ***
|
||||||
|
|
||||||
Pass 1: Checking inodes, blocks, and sizes
|
Pass 1: Checking inodes, blocks, and sizes
|
||||||
Journal inode is not in use, but contains data. Clear? yes
|
Journal inode is not in use, but contains data. Clear? yes
|
||||||
|
@ -23,7 +23,7 @@ Recreate journal? yes
|
||||||
|
|
||||||
Creating journal (1024 blocks): Done.
|
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: ***** FILE SYSTEM WAS MODIFIED *****
|
||||||
test_filesys: 11/256 files (0.0% non-contiguous), 1079/8192 blocks
|
test_filesys: 11/256 files (0.0% non-contiguous), 1079/8192 blocks
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
Superblock has an invalid journal (inode 8).
|
Superblock has an invalid journal (inode 8).
|
||||||
Clear? yes
|
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.
|
Superblock has_journal flag is clear, but a journal is present.
|
||||||
Clear? yes
|
Clear? yes
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
Superblock has an invalid journal (inode 8).
|
Superblock has an invalid journal (inode 8).
|
||||||
Clear? yes
|
Clear? yes
|
||||||
|
|
||||||
*** ext3 journal has been deleted - filesystem is now ext2 only ***
|
*** journal has been deleted ***
|
||||||
|
|
||||||
Pass 1: Checking inodes, blocks, and sizes
|
Pass 1: Checking inodes, blocks, and sizes
|
||||||
Pass 2: Checking directory structure
|
Pass 2: Checking directory structure
|
||||||
|
@ -21,7 +21,7 @@ Recreate journal? yes
|
||||||
|
|
||||||
Creating journal (1024 blocks): Done.
|
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: ***** FILE SYSTEM WAS MODIFIED *****
|
||||||
test_filesys: 11/256 files (0.0% non-contiguous), 1079/2048 blocks
|
test_filesys: 11/256 files (0.0% non-contiguous), 1079/2048 blocks
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
Superblock has an invalid journal (inode 8).
|
Superblock has an invalid journal (inode 8).
|
||||||
Clear? yes
|
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.
|
Superblock has_journal flag is clear, but a journal is present.
|
||||||
Clear? yes
|
Clear? yes
|
||||||
|
@ -26,7 +26,7 @@ Recreate journal? yes
|
||||||
|
|
||||||
Creating journal (1024 blocks): Done.
|
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: ***** FILE SYSTEM WAS MODIFIED *****
|
||||||
test_filesys: 12/128 files (0.0% non-contiguous), 1092/2048 blocks
|
test_filesys: 12/128 files (0.0% non-contiguous), 1092/2048 blocks
|
||||||
|
|
|
@ -57,7 +57,7 @@ test_filesys: recovering journal
|
||||||
Superblock has an invalid journal (inode 8).
|
Superblock has an invalid journal (inode 8).
|
||||||
Clear? yes
|
Clear? yes
|
||||||
|
|
||||||
*** ext3 journal has been deleted - filesystem is now ext2 only ***
|
*** journal has been deleted ***
|
||||||
|
|
||||||
Resize inode not valid. Recreate? yes
|
Resize inode not valid. Recreate? yes
|
||||||
|
|
||||||
|
@ -100,7 +100,7 @@ Recreate journal? yes
|
||||||
|
|
||||||
Creating journal (8192 blocks): Done.
|
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: ***** FILE SYSTEM WAS MODIFIED *****
|
||||||
test_filesys: 11/16384 files (0.0% non-contiguous), 14420/262144 blocks
|
test_filesys: 11/16384 files (0.0% non-contiguous), 14420/262144 blocks
|
||||||
|
|
|
@ -93,7 +93,7 @@ test_filesys: recovering journal
|
||||||
Superblock has an invalid journal (inode 8).
|
Superblock has an invalid journal (inode 8).
|
||||||
Clear? yes
|
Clear? yes
|
||||||
|
|
||||||
*** ext3 journal has been deleted - filesystem is now ext2 only ***
|
*** journal has been deleted ***
|
||||||
|
|
||||||
Resize inode not valid. Recreate? yes
|
Resize inode not valid. Recreate? yes
|
||||||
|
|
||||||
|
@ -139,7 +139,7 @@ Recreate journal? yes
|
||||||
|
|
||||||
Creating journal (16384 blocks): Done.
|
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: ***** FILE SYSTEM WAS MODIFIED *****
|
||||||
test_filesys: 11/32768 files (0.0% non-contiguous), 27039/524288 blocks
|
test_filesys: 11/32768 files (0.0% non-contiguous), 27039/524288 blocks
|
||||||
|
|
|
@ -92,7 +92,7 @@ test_filesys: recovering journal
|
||||||
Superblock has an invalid journal (inode 8).
|
Superblock has an invalid journal (inode 8).
|
||||||
Clear? yes
|
Clear? yes
|
||||||
|
|
||||||
*** ext3 journal has been deleted - filesystem is now ext2 only ***
|
*** journal has been deleted ***
|
||||||
|
|
||||||
Resize inode not valid. Recreate? yes
|
Resize inode not valid. Recreate? yes
|
||||||
|
|
||||||
|
@ -138,7 +138,7 @@ Recreate journal? yes
|
||||||
|
|
||||||
Creating journal (16384 blocks): Done.
|
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: ***** FILE SYSTEM WAS MODIFIED *****
|
||||||
test_filesys: 11/32768 files (0.0% non-contiguous), 27057/524288 blocks
|
test_filesys: 11/32768 files (0.0% non-contiguous), 27057/524288 blocks
|
||||||
|
|
Loading…
Reference in New Issue