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

Commit 59f6fec3 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: remove XFS_FSB_SANITY_CHECK 



We already have a function to verify fsb pointers, so get rid of the
last users of the (less robust) macro.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent d658e72b

fs/xfs/libxfs/xfs_bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ xfs_bmap_check_leaf_extents( 
		pp = XFS_BMBT_PTR_ADDR(mp, block, 1, mp->m_bmap_dmxr[1]);

		bno = be64_to_cpu(*pp);

		XFS_WANT_CORRUPTED_GOTO(mp,

					XFS_FSB_SANITY_CHECK(mp, bno), error0);

					xfs_verify_fsbno(mp, bno), error0);

		if (bp_release) {

			bp_release = 0;

			xfs_trans_brelse(NULL, bp);
@@ -1220,7 +1220,7 @@ xfs_iread_extents( 
		pp = XFS_BMBT_PTR_ADDR(mp, block, 1, mp->m_bmap_dmxr[1]);

		bno = be64_to_cpu(*pp);

		XFS_WANT_CORRUPTED_GOTO(mp,

			XFS_FSB_SANITY_CHECK(mp, bno), out_brelse);

			xfs_verify_fsbno(mp, bno), out_brelse);

		xfs_trans_brelse(tp, bp);

	}

fs/xfs/libxfs/xfs_bmap_btree.c

+2 −2
Original line number Diff line number Diff line
@@ -470,11 +470,11 @@ xfs_bmbt_verify( 
	/* sibling pointer verification */

	if (!block->bb_u.l.bb_leftsib ||

	    (block->bb_u.l.bb_leftsib != cpu_to_be64(NULLFSBLOCK) &&

	     !XFS_FSB_SANITY_CHECK(mp, be64_to_cpu(block->bb_u.l.bb_leftsib))))

	     !xfs_verify_fsbno(mp, be64_to_cpu(block->bb_u.l.bb_leftsib))))

		return false;

	if (!block->bb_u.l.bb_rightsib ||

	    (block->bb_u.l.bb_rightsib != cpu_to_be64(NULLFSBLOCK) &&

	     !XFS_FSB_SANITY_CHECK(mp, be64_to_cpu(block->bb_u.l.bb_rightsib))))

	     !xfs_verify_fsbno(mp, be64_to_cpu(block->bb_u.l.bb_rightsib))))

		return false;



	return true;

fs/xfs/libxfs/xfs_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -853,7 +853,7 @@ xfs_btree_read_bufl( 
	xfs_daddr_t		d;		/* real disk block address */

	int			error;



	if (!XFS_FSB_SANITY_CHECK(mp, fsbno))

	if (!xfs_verify_fsbno(mp, fsbno))

		return -EFSCORRUPTED;

	d = XFS_FSB_TO_DADDR(mp, fsbno);

	error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, d,

fs/xfs/libxfs/xfs_btree.h

+0 −4
Original line number Diff line number Diff line
@@ -473,10 +473,6 @@ static inline int xfs_btree_get_level(struct xfs_btree_block *block) 
#define	XFS_FILBLKS_MIN(a,b)	min_t(xfs_filblks_t, (a), (b))

#define	XFS_FILBLKS_MAX(a,b)	max_t(xfs_filblks_t, (a), (b))



#define	XFS_FSB_SANITY_CHECK(mp,fsb)	\

	(fsb && XFS_FSB_TO_AGNO(mp, fsb) < mp->m_sb.sb_agcount && \

		XFS_FSB_TO_AGBNO(mp, fsb) < mp->m_sb.sb_agblocks)



/*

 * Trace hooks.  Currently not implemented as they need to be ported

 * over to the generic tracing functionality, which is some effort.