ext4: call out CRC and corruption errors with specific error codes

Instead of overloading EIO for CRC errors and corrupt structures,
return the same error codes that XFS returns for the same issues.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

1 files changed, 8 insertions, 8 deletions

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index f205ac3c4e41..2b9278867caf 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -378,7 +378,7 @@ static int __check_block_validity(struct inode *inode, const char *func,
                                  "lblock %lu mapped to illegal pblock "
                                  "(length %d)", (unsigned long) map->m_lblk,
                                  map->m_len);
-                return -EIO;
+                return -EFSCORRUPTED;
         }
         return 0;
 }
@@ -480,7 +480,7 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode,
 
         /* We can handle the block number less than EXT_MAX_BLOCKS */
         if (unlikely(map->m_lblk >= EXT_MAX_BLOCKS))
-                return -EIO;
+                return -EFSCORRUPTED;
 
         /* Lookup extent status tree firstly */
         if (ext4_es_lookup_extent(inode, map->m_lblk, &es)) {
@@ -3863,7 +3863,7 @@ static int __ext4_get_inode_loc(struct inode *inode,
 
         iloc->bh = NULL;
         if (!ext4_valid_inum(sb, inode->i_ino))
-                return -EIO;
+                return -EFSCORRUPTED;
 
         iloc->block_group = (inode->i_ino - 1) / EXT4_INODES_PER_GROUP(sb);
         gdp = ext4_get_group_desc(sb, iloc->block_group, NULL);
@@ -4111,7 +4111,7 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
                         EXT4_ERROR_INODE(inode, "bad extra_isize (%u != %u)",
                                 EXT4_GOOD_OLD_INODE_SIZE + ei->i_extra_isize,
                                 EXT4_INODE_SIZE(inode->i_sb));
-                        ret = -EIO;
+                        ret = -EFSCORRUPTED;
                         goto bad_inode;
                 }
         } else
@@ -4131,7 +4131,7 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
 
         if (!ext4_inode_csum_verify(inode, raw_inode, ei)) {
                 EXT4_ERROR_INODE(inode, "checksum invalid");
-                ret = -EIO;
+                ret = -EFSBADCRC;
                 goto bad_inode;
         }
 
@@ -4246,7 +4246,7 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
             !ext4_data_block_valid(EXT4_SB(sb), ei->i_file_acl, 1)) {
                 EXT4_ERROR_INODE(inode, "bad extended attribute block %llu",
                                  ei->i_file_acl);
-                ret = -EIO;
+                ret = -EFSCORRUPTED;
                 goto bad_inode;
         } else if (!ext4_has_inline_data(inode)) {
                 if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {
@@ -4297,7 +4297,7 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
         } else if (ino == EXT4_BOOT_LOADER_INO) {
                 make_bad_inode(inode);
         } else {
-                ret = -EIO;
+                ret = -EFSCORRUPTED;
                 EXT4_ERROR_INODE(inode, "bogus i_mode (%o)", inode->i_mode);
                 goto bad_inode;
         }
@@ -4315,7 +4315,7 @@ bad_inode:
 struct inode *ext4_iget_normal(struct super_block *sb, unsigned long ino)
 {
         if (ino < EXT4_FIRST_INO(sb) && ino != EXT4_ROOT_INO)
-                return ERR_PTR(-EIO);
+                return ERR_PTR(-EFSCORRUPTED);
         return ext4_iget(sb, ino);
 }