Commit 807df322 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Carlos Maiolino
Browse files

xfs: remove the expr argument to XFS_TEST_ERROR 



Don't pass expr to XFS_TEST_ERROR.  Most calls pass a constant false,
and the places that do pass an expression become cleaner by moving it
out.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarCarlos Maiolino <cem@kernel.org>
parent 991dcada

fs/xfs/libxfs/xfs_ag_resv.c

+3 −4
Original line number Diff line number Diff line
@@ -92,9 +92,8 @@ xfs_ag_resv_critical( 
	trace_xfs_ag_resv_critical(pag, type, avail);



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

	return XFS_TEST_ERROR(avail < orig / 10 ||

			      avail < mp->m_agbtree_maxlevels,

			mp, XFS_ERRTAG_AG_RESV_CRITICAL);

	return avail < orig / 10 || avail < mp->m_agbtree_maxlevels ||

		XFS_TEST_ERROR(mp, XFS_ERRTAG_AG_RESV_CRITICAL);

}



/*
@@ -203,7 +202,7 @@ __xfs_ag_resv_init( 
		return -EINVAL;

	}



	if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_AG_RESV_FAIL))

	if (XFS_TEST_ERROR(mp, XFS_ERRTAG_AG_RESV_FAIL))

		error = -ENOSPC;

	else

		error = xfs_dec_fdblocks(mp, hidden_space, true);

fs/xfs/libxfs/xfs_alloc.c

+2 −3
Original line number Diff line number Diff line
@@ -3321,7 +3321,7 @@ xfs_agf_read_verify( 
		xfs_verifier_error(bp, -EFSBADCRC, __this_address);

	else {

		fa = xfs_agf_verify(bp);

		if (XFS_TEST_ERROR(fa, mp, XFS_ERRTAG_ALLOC_READ_AGF))

		if (fa || XFS_TEST_ERROR(mp, XFS_ERRTAG_ALLOC_READ_AGF))

			xfs_verifier_error(bp, -EFSCORRUPTED, fa);

	}

}
@@ -4019,8 +4019,7 @@ __xfs_free_extent( 
	ASSERT(len != 0);

	ASSERT(type != XFS_AG_RESV_AGFL);



	if (XFS_TEST_ERROR(false, mp,

			XFS_ERRTAG_FREE_EXTENT))

	if (XFS_TEST_ERROR(mp, XFS_ERRTAG_FREE_EXTENT))

		return -EIO;



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

fs/xfs/libxfs/xfs_attr_leaf.c

+1 −1
Original line number Diff line number Diff line
@@ -1212,7 +1212,7 @@ xfs_attr3_leaf_to_node( 


	trace_xfs_attr_leaf_to_node(args);



	if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_ATTR_LEAF_TO_NODE)) {

	if (XFS_TEST_ERROR(mp, XFS_ERRTAG_ATTR_LEAF_TO_NODE)) {

		error = -EIO;

		goto out;

	}

fs/xfs/libxfs/xfs_bmap.c

+8 −9
Original line number Diff line number Diff line
@@ -3654,8 +3654,7 @@ xfs_bmap_btalloc( 
	/* Trim the allocation back to the maximum an AG can fit. */

	args.maxlen = min(ap->length, mp->m_ag_max_usable);



	if (unlikely(XFS_TEST_ERROR(false, mp,

			XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT)))

	if (unlikely(XFS_TEST_ERROR(mp, XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT)))

		error = xfs_bmap_exact_minlen_extent_alloc(ap, &args);

	else if ((ap->datatype & XFS_ALLOC_USERDATA) &&

			xfs_inode_is_filestream(ap->ip))
@@ -3841,7 +3840,7 @@ xfs_bmapi_read( 
	}



	if (XFS_IS_CORRUPT(mp, !xfs_ifork_has_extents(ifp)) ||

	    XFS_TEST_ERROR(false, mp, XFS_ERRTAG_BMAPIFORMAT)) {

	    XFS_TEST_ERROR(mp, XFS_ERRTAG_BMAPIFORMAT)) {

		xfs_bmap_mark_sick(ip, whichfork);

		return -EFSCORRUPTED;

	}
@@ -4192,7 +4191,7 @@ xfs_bmapi_write( 
			(XFS_BMAPI_PREALLOC | XFS_BMAPI_ZERO));



	if (XFS_IS_CORRUPT(mp, !xfs_ifork_has_extents(ifp)) ||

	    XFS_TEST_ERROR(false, mp, XFS_ERRTAG_BMAPIFORMAT)) {

	    XFS_TEST_ERROR(mp, XFS_ERRTAG_BMAPIFORMAT)) {

		xfs_bmap_mark_sick(ip, whichfork);

		return -EFSCORRUPTED;

	}
@@ -4537,7 +4536,7 @@ xfs_bmapi_remap( 
			(XFS_BMAPI_ATTRFORK | XFS_BMAPI_PREALLOC));



	if (XFS_IS_CORRUPT(mp, !xfs_ifork_has_extents(ifp)) ||

	    XFS_TEST_ERROR(false, mp, XFS_ERRTAG_BMAPIFORMAT)) {

	    XFS_TEST_ERROR(mp, XFS_ERRTAG_BMAPIFORMAT)) {

		xfs_bmap_mark_sick(ip, whichfork);

		return -EFSCORRUPTED;

	}
@@ -5671,7 +5670,7 @@ xfs_bmap_collapse_extents( 
	int			logflags = 0;



	if (XFS_IS_CORRUPT(mp, !xfs_ifork_has_extents(ifp)) ||

	    XFS_TEST_ERROR(false, mp, XFS_ERRTAG_BMAPIFORMAT)) {

	    XFS_TEST_ERROR(mp, XFS_ERRTAG_BMAPIFORMAT)) {

		xfs_bmap_mark_sick(ip, whichfork);

		return -EFSCORRUPTED;

	}
@@ -5787,7 +5786,7 @@ xfs_bmap_insert_extents( 
	int			logflags = 0;



	if (XFS_IS_CORRUPT(mp, !xfs_ifork_has_extents(ifp)) ||

	    XFS_TEST_ERROR(false, mp, XFS_ERRTAG_BMAPIFORMAT)) {

	    XFS_TEST_ERROR(mp, XFS_ERRTAG_BMAPIFORMAT)) {

		xfs_bmap_mark_sick(ip, whichfork);

		return -EFSCORRUPTED;

	}
@@ -5892,7 +5891,7 @@ xfs_bmap_split_extent( 
	int				i = 0;



	if (XFS_IS_CORRUPT(mp, !xfs_ifork_has_extents(ifp)) ||

	    XFS_TEST_ERROR(false, mp, XFS_ERRTAG_BMAPIFORMAT)) {

	    XFS_TEST_ERROR(mp, XFS_ERRTAG_BMAPIFORMAT)) {

		xfs_bmap_mark_sick(ip, whichfork);

		return -EFSCORRUPTED;

	}
@@ -6057,7 +6056,7 @@ xfs_bmap_finish_one( 


	trace_xfs_bmap_deferred(bi);



	if (XFS_TEST_ERROR(false, tp->t_mountp, XFS_ERRTAG_BMAP_FINISH_ONE))

	if (XFS_TEST_ERROR(tp->t_mountp, XFS_ERRTAG_BMAP_FINISH_ONE))

		return -EIO;



	switch (bi->bi_type) {

fs/xfs/libxfs/xfs_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ xfs_btree_check_block( 


	fa = __xfs_btree_check_block(cur, block, level, bp);

	if (XFS_IS_CORRUPT(mp, fa != NULL) ||

	    XFS_TEST_ERROR(false, mp, xfs_btree_block_errtag(cur))) {

	    XFS_TEST_ERROR(mp, xfs_btree_block_errtag(cur))) {

		if (bp)

			trace_xfs_btree_corrupt(bp, _RET_IP_);

		xfs_btree_mark_sick(cur);