Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c494dbca authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Greg Kroah-Hartman
Browse files

xfs: replace -EIO with -EFSCORRUPTED for corrupt metadata 



commit c2414ad6e66ab96b867309454498f7fb29b7e855 upstream.

There are a few places where we return -EIO instead of -EFSCORRUPTED
when we find corrupt metadata.  Fix those places.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bb7eb3ca

fs/xfs/libxfs/xfs_bmap.c

+3 −3
Original line number Diff line number Diff line
@@ -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)
@@ -5872,7 +5872,7 @@ xfs_bmap_insert_extents( 
				del_cursor);



	if (stop_fsb >= got.br_startoff + got.br_blockcount) {

		error = -EIO;

		error = -EFSCORRUPTED;

		goto del_cursor;

	}

fs/xfs/xfs_attr_inactive.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	}

fs/xfs/xfs_dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -1125,7 +1125,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 */