On Thu, Oct 24, 2019 at 10:15:11PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
> There are a few places where we return -EIO instead of -EFSCORRUPTED
> when we find corrupt metadata. Fix those places.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/libxfs/xfs_bmap.c | 6 +++---
> fs/xfs/xfs_attr_inactive.c | 6 +++---
> fs/xfs/xfs_dquot.c | 2 +-
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index 02469d59c787..587889585a23 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -1374,7 +1374,7 @@ xfs_bmap_last_before(
> case XFS_DINODE_FMT_EXTENTS:
> break;
> default:
> - return -EIO;
> + return -EFSCORRUPTED;
> }
>
> if (!(ifp->if_flags & XFS_IFEXTENTS)) {
> @@ -1475,7 +1475,7 @@ xfs_bmap_last_offset(
>
> if (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE &&
> XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS)
> - return -EIO;
> + return -EFSCORRUPTED;
>
> error = xfs_bmap_last_extent(NULL, ip, whichfork, &rec, &is_empty);
> if (error || is_empty)
> @@ -5864,7 +5864,7 @@ xfs_bmap_insert_extents(
> del_cursor);
>
> if (stop_fsb >= got.br_startoff + got.br_blockcount) {
> - error = -EIO;
> + error = -EFSCORRUPTED;
> goto del_cursor;
> }
>
> diff --git a/fs/xfs/xfs_attr_inactive.c b/fs/xfs/xfs_attr_inactive.c
> index a640a285cc52..f83f11d929e4 100644
> --- a/fs/xfs/xfs_attr_inactive.c
> +++ b/fs/xfs/xfs_attr_inactive.c
> @@ -209,7 +209,7 @@ xfs_attr3_node_inactive(
> */
> if (level > XFS_DA_NODE_MAXDEPTH) {
> xfs_trans_brelse(*trans, bp); /* no locks for later trans */
> - return -EIO;
> + return -EFSCORRUPTED;
> }
>
> node = bp->b_addr;
> @@ -258,7 +258,7 @@ xfs_attr3_node_inactive(
> error = xfs_attr3_leaf_inactive(trans, dp, child_bp);
> break;
> default:
> - error = -EIO;
> + error = -EFSCORRUPTED;
> xfs_trans_brelse(*trans, child_bp);
> break;
> }
> @@ -341,7 +341,7 @@ xfs_attr3_root_inactive(
> error = xfs_attr3_leaf_inactive(trans, dp, bp);
> break;
> default:
> - error = -EIO;
> + error = -EFSCORRUPTED;
> xfs_trans_brelse(*trans, bp);
> break;
> }
> diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
> index aeb95e7391c1..2b87c96fb2c0 100644
> --- a/fs/xfs/xfs_dquot.c
> +++ b/fs/xfs/xfs_dquot.c
> @@ -1126,7 +1126,7 @@ xfs_qm_dqflush(
> xfs_buf_relse(bp);
> xfs_dqfunlock(dqp);
> xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
> - return -EIO;
> + return -EFSCORRUPTED;
> }
>
> /* This is the only portion of data that needs to persist */
>
