diff --git a/e2fsck/jfs_user.h b/e2fsck/jfs_user.h index be81f43f..f46bb1e0 100644 --- a/e2fsck/jfs_user.h +++ b/e2fsck/jfs_user.h @@ -181,6 +181,13 @@ extern e2fsck_t e2fsck_global_ctx; /* Try your very best not to use this! */ #endif /* DEBUGFS */ +#ifndef EFSBADCRC +#define EFSBADCRC EBADMSG /* Bad CRC detected */ +#endif +#ifndef EFSCORRUPTED +#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ +#endif + /* recovery.c */ extern int journal_recover (journal_t *journal); extern int journal_skip_recovery (journal_t *); diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c index 41bda03b..b828ed4c 100644 --- a/e2fsck/recovery.c +++ b/e2fsck/recovery.c @@ -140,7 +140,7 @@ static int jread(struct buffer_head **bhp, journal_t *journal, if (offset >= journal->j_maxlen) { printk(KERN_ERR "JBD2: corrupted journal superblock\n"); - return -EIO; + return -EFSCORRUPTED; } err = journal_bmap(journal, offset, &blocknr); @@ -524,7 +524,7 @@ static int do_one_pass(journal_t *journal, if (descr_csum_size > 0 && !jbd2_descr_block_csum_verify(journal, bh->b_data)) { - err = -EIO; + err = -EFSBADCRC; brelse(bh); goto failed; } @@ -598,7 +598,7 @@ static int do_one_pass(journal_t *journal, journal, tag, obh->b_data, ext2fs_be32_to_cpu(tmp->h_sequence))) { brelse(obh); - success = -EIO; + success = -EFSBADCRC; printk(KERN_ERR "JBD2: Invalid " "checksum recovering " "block %llu in log\n", @@ -844,7 +844,7 @@ static int scan_revoke_records(journal_t *journal, struct buffer_head *bh, rcount = ext2fs_be32_to_cpu(header->r_count); if (!jbd2_revoke_block_csum_verify(journal, header)) - return -EINVAL; + return -EFSBADCRC; if (journal_has_csum_v2or3(journal)) csum_size = sizeof(struct journal_revoke_tail);