e2fsck: improve error messages when the journal sb is corrupt

If the journal superblock is corrupt and the user declines to fix it
(or runs e2fsck -n), make sure the error messages are clear and
explain that e2fsck cannot (safely) proceed.

Addresses-Debian-Bug: #768162

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

diff --git a/debugfs/journal.c b/debugfs/journal.c
index aa6325d..fcd5d5e 100644 (file)
--- a/debugfs/journal.c
+++ b/debugfs/journal.c
@@ -583,7 +583,7 @@ static errcode_t ext2fs_journal_load(journal_t *journal)
        case JFS_DESCRIPTOR_BLOCK:
        case JFS_COMMIT_BLOCK:
        case JFS_REVOKE_BLOCK:
-               return EXT2_ET_CORRUPT_SUPERBLOCK;
+               return EXT2_ET_CORRUPT_JOURNAL_SB;
 
        /* If we don't understand the superblock major type, but there
         * is a magic number, then it is likely to be a new format we
@@ -600,15 +600,15 @@ static errcode_t ext2fs_journal_load(journal_t *journal)
 
        /* Checksum v1-3 are mutually exclusive features. */
        if (jfs_has_feature_csum2(journal) && jfs_has_feature_csum3(journal))
-               return EXT2_ET_CORRUPT_SUPERBLOCK;
+               return EXT2_ET_CORRUPT_JOURNAL_SB;
 
        if (journal_has_csum_v2or3(journal) &&
            jfs_has_feature_checksum(journal))
-               return EXT2_ET_CORRUPT_SUPERBLOCK;
+               return EXT2_ET_CORRUPT_JOURNAL_SB;
 
        if (!ext2fs_journal_verify_csum_type(journal, jsb) ||
            !ext2fs_journal_sb_csum_verify(journal, jsb))
-               return EXT2_ET_CORRUPT_SUPERBLOCK;
+               return EXT2_ET_CORRUPT_JOURNAL_SB;
 
        if (journal_has_csum_v2or3(journal))
                journal->j_csum_seed = jbd2_chksum(journal, ~0, jsb->s_uuid,
@@ -618,12 +618,12 @@ static errcode_t ext2fs_journal_load(journal_t *journal)
         * format to be able to proceed safely, so any other checks that
         * fail we should attempt to recover from. */
        if (jsb->s_blocksize != htonl(journal->j_blocksize))
-               return EXT2_ET_CORRUPT_SUPERBLOCK;
+               return EXT2_ET_CORRUPT_JOURNAL_SB;
 
        if (ntohl(jsb->s_maxlen) < journal->j_maxlen)
                journal->j_maxlen = ntohl(jsb->s_maxlen);
        else if (ntohl(jsb->s_maxlen) > journal->j_maxlen)
-               return EXT2_ET_CORRUPT_SUPERBLOCK;
+               return EXT2_ET_CORRUPT_JOURNAL_SB;
 
        journal->j_tail_sequence = ntohl(jsb->s_sequence);
        journal->j_transaction_sequence = journal->j_tail_sequence;

diff --git a/e2fsck/journal.c b/e2fsck/journal.c
index c8ac57d..b4c82b3 100644 (file)
--- a/e2fsck/journal.c
+++ b/e2fsck/journal.c
@@ -550,7 +550,7 @@ static errcode_t e2fsck_journal_fix_bad_inode(e2fsck_t ctx,
                        e2fsck_clear_recover(ctx, 1);
                        return 0;
                }
-               return EXT2_ET_BAD_INODE_NUM;
+               return EXT2_ET_CORRUPT_JOURNAL_SB;
        } else if (recover) {
                if (fix_problem(ctx, PR_0_JOURNAL_RECOVER_SET, pctx)) {
                        e2fsck_clear_recover(ctx, 1);
@@ -627,7 +627,7 @@ static errcode_t e2fsck_journal_load(journal_t *journal)
        case JFS_DESCRIPTOR_BLOCK:
        case JFS_COMMIT_BLOCK:
        case JFS_REVOKE_BLOCK:
-               return EXT2_ET_CORRUPT_SUPERBLOCK;
+               return EXT2_ET_CORRUPT_JOURNAL_SB;
 
        /* If we don't understand the superblock major type, but there
         * is a magic number, then it is likely to be a new format we
@@ -644,15 +644,15 @@ static errcode_t e2fsck_journal_load(journal_t *journal)
 
        /* Checksum v1-3 are mutually exclusive features. */
        if (jfs_has_feature_csum2(journal) && jfs_has_feature_csum3(journal))
-               return EXT2_ET_CORRUPT_SUPERBLOCK;
+               return EXT2_ET_CORRUPT_JOURNAL_SB;
 
        if (journal_has_csum_v2or3(journal) &&
            jfs_has_feature_checksum(journal))
-               return EXT2_ET_CORRUPT_SUPERBLOCK;
+               return EXT2_ET_CORRUPT_JOURNAL_SB;
 
        if (!e2fsck_journal_verify_csum_type(journal, jsb) ||
            !e2fsck_journal_sb_csum_verify(journal, jsb))
-               return EXT2_ET_CORRUPT_SUPERBLOCK;
+               return EXT2_ET_CORRUPT_JOURNAL_SB;
 
        if (journal_has_csum_v2or3(journal))
                journal->j_csum_seed = jbd2_chksum(journal, ~0, jsb->s_uuid,
@@ -662,19 +662,19 @@ static errcode_t e2fsck_journal_load(journal_t *journal)
         * format to be able to proceed safely, so any other checks that
         * fail we should attempt to recover from. */
        if (jsb->s_blocksize != htonl(journal->j_blocksize)) {
-               com_err(ctx->program_name, EXT2_ET_CORRUPT_SUPERBLOCK,
+               com_err(ctx->program_name, EXT2_ET_CORRUPT_JOURNAL_SB,
                        _("%s: no valid journal superblock found\n"),
                        ctx->device_name);
-               return EXT2_ET_CORRUPT_SUPERBLOCK;
+               return EXT2_ET_CORRUPT_JOURNAL_SB;
        }
 
        if (ntohl(jsb->s_maxlen) < journal->j_maxlen)
                journal->j_maxlen = ntohl(jsb->s_maxlen);
        else if (ntohl(jsb->s_maxlen) > journal->j_maxlen) {
-               com_err(ctx->program_name, EXT2_ET_CORRUPT_SUPERBLOCK,
+               com_err(ctx->program_name, EXT2_ET_CORRUPT_JOURNAL_SB,
                        _("%s: journal too short\n"),
                        ctx->device_name);
-               return EXT2_ET_CORRUPT_SUPERBLOCK;
+               return EXT2_ET_CORRUPT_JOURNAL_SB;
        }
 
        journal->j_tail_sequence = ntohl(jsb->s_sequence);
@@ -746,9 +746,9 @@ static errcode_t e2fsck_journal_fix_corrupt_super(e2fsck_t ctx,
                        e2fsck_clear_recover(ctx, recover);
                        return 0;
                }
-               return EXT2_ET_CORRUPT_SUPERBLOCK;
+               return EXT2_ET_CORRUPT_JOURNAL_SB;
        } else if (e2fsck_journal_fix_bad_inode(ctx, pctx))
-               return EXT2_ET_CORRUPT_SUPERBLOCK;
+               return EXT2_ET_CORRUPT_JOURNAL_SB;
 
        return 0;
 }
@@ -820,7 +820,7 @@ errcode_t e2fsck_check_ext3_journal(e2fsck_t ctx)
 
        retval = e2fsck_journal_load(journal);
        if (retval) {
-               if ((retval == EXT2_ET_CORRUPT_SUPERBLOCK) ||
+               if ((retval == EXT2_ET_CORRUPT_JOURNAL_SB) ||
                    ((retval == EXT2_ET_UNSUPP_FEATURE) &&
                    (!fix_problem(ctx, PR_0_JOURNAL_UNSUPP_INCOMPAT,
                                  &pctx))) ||

diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 004a6e5..f9409f7 100644 (file)
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -1647,7 +1647,8 @@ failure:
                        com_err(ctx->program_name, retval,
                                _("while checking journal for %s"),
                                ctx->device_name);
-                       fatal_error(ctx, 0);
+                       fatal_error(ctx,
+                               _("Cannot proceed with file system check"));
                }
        }
 

diff --git a/lib/ext2fs/ext2_err.et.in b/lib/ext2fs/ext2_err.et.in
index 464c01f..2a109ca 100644 (file)
--- a/lib/ext2fs/ext2_err.et.in
+++ b/lib/ext2fs/ext2_err.et.in
@@ -536,4 +536,7 @@ ec  EXT2_ET_FILESYSTEM_CORRUPTED,
 ec     EXT2_ET_BAD_CRC,
        "Bad CRC detected in file system"
 
+ec     EXT2_ET_CORRUPT_JOURNAL_SB,
+       "The journal superblock is corrupt"
+
        end