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

Commit 9e24cfd0 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: remove unneeded parameter from XFS_TEST_ERROR 



Since we moved the injected error frequency controls to the mountpoint,
we can get rid of the last argument to XFS_TEST_ERROR.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
parent c6840101

fs/xfs/libxfs/xfs_ag_resv.c

+1 −2
Original line number Diff line number Diff line
@@ -111,8 +111,7 @@ xfs_ag_resv_critical( 


	/* Critically low if less than 10% or max btree height remains. */

	return XFS_TEST_ERROR(avail < orig / 10 || avail < XFS_BTREE_MAXLEVELS,

			pag->pag_mount, XFS_ERRTAG_AG_RESV_CRITICAL,

			XFS_RANDOM_AG_RESV_CRITICAL);

			pag->pag_mount, XFS_ERRTAG_AG_RESV_CRITICAL);

}



/*

fs/xfs/libxfs/xfs_alloc.c

+2 −4
Original line number Diff line number Diff line
@@ -2454,8 +2454,7 @@ xfs_agf_read_verify( 
	    !xfs_buf_verify_cksum(bp, XFS_AGF_CRC_OFF))

		xfs_buf_ioerror(bp, -EFSBADCRC);

	else if (XFS_TEST_ERROR(!xfs_agf_verify(mp, bp), mp,

				XFS_ERRTAG_ALLOC_READ_AGF,

				XFS_RANDOM_ALLOC_READ_AGF))

				XFS_ERRTAG_ALLOC_READ_AGF))

		xfs_buf_ioerror(bp, -EFSCORRUPTED);



	if (bp->b_error)
@@ -2842,8 +2841,7 @@ xfs_free_extent( 
	ASSERT(type != XFS_AG_RESV_AGFL);



	if (XFS_TEST_ERROR(false, mp,

			XFS_ERRTAG_FREE_EXTENT,

			XFS_RANDOM_FREE_EXTENT))

			XFS_ERRTAG_FREE_EXTENT))

		return -EIO;



	error = xfs_free_extent_fix_freelist(tp, agno, &agbp);

fs/xfs/libxfs/xfs_bmap.c

+6 −7
Original line number Diff line number Diff line
@@ -3992,7 +3992,7 @@ xfs_bmapi_read( 
	if (unlikely(XFS_TEST_ERROR(

	    (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS &&

	     XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE),

	     mp, XFS_ERRTAG_BMAPIFORMAT, XFS_RANDOM_BMAPIFORMAT))) {

	     mp, XFS_ERRTAG_BMAPIFORMAT))) {

		XFS_ERROR_REPORT("xfs_bmapi_read", XFS_ERRLEVEL_LOW, mp);

		return -EFSCORRUPTED;

	}
@@ -4473,7 +4473,7 @@ xfs_bmapi_write( 
	if (unlikely(XFS_TEST_ERROR(

	    (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS &&

	     XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE),

	     mp, XFS_ERRTAG_BMAPIFORMAT, XFS_RANDOM_BMAPIFORMAT))) {

	     mp, XFS_ERRTAG_BMAPIFORMAT))) {

		XFS_ERROR_REPORT("xfs_bmapi_write", XFS_ERRLEVEL_LOW, mp);

		return -EFSCORRUPTED;

	}
@@ -4694,7 +4694,7 @@ xfs_bmapi_remap( 
	if (unlikely(XFS_TEST_ERROR(

	    (XFS_IFORK_FORMAT(ip, XFS_DATA_FORK) != XFS_DINODE_FMT_EXTENTS &&

	     XFS_IFORK_FORMAT(ip, XFS_DATA_FORK) != XFS_DINODE_FMT_BTREE),

	     mp, XFS_ERRTAG_BMAPIFORMAT, XFS_RANDOM_BMAPIFORMAT))) {

	     mp, XFS_ERRTAG_BMAPIFORMAT))) {

		XFS_ERROR_REPORT("xfs_bmapi_remap", XFS_ERRLEVEL_LOW, mp);

		return -EFSCORRUPTED;

	}
@@ -6098,7 +6098,7 @@ xfs_bmap_shift_extents( 
	if (unlikely(XFS_TEST_ERROR(

	    (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS &&

	     XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE),

	     mp, XFS_ERRTAG_BMAPIFORMAT, XFS_RANDOM_BMAPIFORMAT))) {

	     mp, XFS_ERRTAG_BMAPIFORMAT))) {

		XFS_ERROR_REPORT("xfs_bmap_shift_extents",

				 XFS_ERRLEVEL_LOW, mp);

		return -EFSCORRUPTED;
@@ -6250,7 +6250,7 @@ xfs_bmap_split_extent_at( 
	if (unlikely(XFS_TEST_ERROR(

	    (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS &&

	     XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE),

	     mp, XFS_ERRTAG_BMAPIFORMAT, XFS_RANDOM_BMAPIFORMAT))) {

	     mp, XFS_ERRTAG_BMAPIFORMAT))) {

		XFS_ERROR_REPORT("xfs_bmap_split_extent_at",

				 XFS_ERRLEVEL_LOW, mp);

		return -EFSCORRUPTED;
@@ -6508,8 +6508,7 @@ xfs_bmap_finish_one( 
		return -EFSCORRUPTED;



	if (XFS_TEST_ERROR(false, tp->t_mountp,

			XFS_ERRTAG_BMAP_FINISH_ONE,

			XFS_RANDOM_BMAP_FINISH_ONE))

			XFS_ERRTAG_BMAP_FINISH_ONE))

		return -EIO;



	switch (type) {

fs/xfs/libxfs/xfs_btree.c

+2 −4
Original line number Diff line number Diff line
@@ -101,8 +101,7 @@ xfs_btree_check_lblock( 
			be64_to_cpu(block->bb_u.l.bb_rightsib)));



	if (unlikely(XFS_TEST_ERROR(!lblock_ok, mp,

			XFS_ERRTAG_BTREE_CHECK_LBLOCK,

			XFS_RANDOM_BTREE_CHECK_LBLOCK))) {

			XFS_ERRTAG_BTREE_CHECK_LBLOCK))) {

		if (bp)

			trace_xfs_btree_corrupt(bp, _RET_IP_);

		XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp);
@@ -153,8 +152,7 @@ xfs_btree_check_sblock( 
		block->bb_u.s.bb_rightsib;



	if (unlikely(XFS_TEST_ERROR(!sblock_ok, mp,

			XFS_ERRTAG_BTREE_CHECK_SBLOCK,

			XFS_RANDOM_BTREE_CHECK_SBLOCK))) {

			XFS_ERRTAG_BTREE_CHECK_SBLOCK))) {

		if (bp)

			trace_xfs_btree_corrupt(bp, _RET_IP_);

		XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp);

fs/xfs/libxfs/xfs_dir2.c

+1 −2
Original line number Diff line number Diff line
@@ -218,8 +218,7 @@ xfs_dir_ino_validate( 
		agblkno != 0 &&

		ioff < (1 << mp->m_sb.sb_inopblog) &&

		XFS_AGINO_TO_INO(mp, agno, agino) == ino;

	if (unlikely(XFS_TEST_ERROR(!ino_ok, mp, XFS_ERRTAG_DIR_INO_VALIDATE,

			XFS_RANDOM_DIR_INO_VALIDATE))) {

	if (unlikely(XFS_TEST_ERROR(!ino_ok, mp, XFS_ERRTAG_DIR_INO_VALIDATE))) {

		xfs_warn(mp, "Invalid inode number 0x%Lx",

				(unsigned long long) ino);

		XFS_ERROR_REPORT("xfs_dir_ino_validate", XFS_ERRLEVEL_LOW, mp);