Commit 3d2b6d03 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: rename xfs_verify_rtext to xfs_verify_rtbext 



This helper function validates that a range of *blocks* in the
realtime section is completely contained within the realtime section.
It does /not/ validate ranges of *rtextents*.  Rename the function to
avoid suggesting that it does, and change the type of the @len parameter
since xfs_rtblock_t is a position unit, not a length unit.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent f29c3e74

fs/xfs/libxfs/xfs_bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -6196,7 +6196,7 @@ xfs_bmap_validate_extent( 
		return __this_address;



	if (XFS_IS_REALTIME_INODE(ip) && whichfork == XFS_DATA_FORK) {

		if (!xfs_verify_rtext(mp, irec->br_startblock,

		if (!xfs_verify_rtbext(mp, irec->br_startblock,

					   irec->br_blockcount))

			return __this_address;

	} else {

fs/xfs/libxfs/xfs_types.c

+2 −2
Original line number Diff line number Diff line
@@ -148,10 +148,10 @@ xfs_verify_rtbno( 


/* Verify that a realtime device extent is fully contained inside the volume. */

bool

xfs_verify_rtext(

xfs_verify_rtbext(

	struct xfs_mount	*mp,

	xfs_rtblock_t		rtbno,

	xfs_rtblock_t		len)

	xfs_filblks_t		len)

{

	if (rtbno + len <= rtbno)

		return false;

fs/xfs/libxfs/xfs_types.h

+2 −2
Original line number Diff line number Diff line
@@ -231,8 +231,8 @@ bool xfs_verify_ino(struct xfs_mount *mp, xfs_ino_t ino); 
bool xfs_internal_inum(struct xfs_mount *mp, xfs_ino_t ino);

bool xfs_verify_dir_ino(struct xfs_mount *mp, xfs_ino_t ino);

bool xfs_verify_rtbno(struct xfs_mount *mp, xfs_rtblock_t rtbno);

bool xfs_verify_rtext(struct xfs_mount *mp, xfs_rtblock_t rtbno,

		xfs_rtblock_t len);

bool xfs_verify_rtbext(struct xfs_mount *mp, xfs_rtblock_t rtbno,

		xfs_filblks_t len);

bool xfs_verify_icount(struct xfs_mount *mp, unsigned long long icount);

bool xfs_verify_dablk(struct xfs_mount *mp, xfs_fileoff_t off);

void xfs_icount_range(struct xfs_mount *mp, unsigned long long *min,

fs/xfs/scrub/bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ xchk_bmap_iextent( 


	/* Make sure the extent points to a valid place. */

	if (info->is_rt &&

	    !xfs_verify_rtext(mp, irec->br_startblock, irec->br_blockcount))

	    !xfs_verify_rtbext(mp, irec->br_startblock, irec->br_blockcount))

		xchk_fblock_set_corrupt(info->sc, info->whichfork,

				irec->br_startoff);

	if (!info->is_rt &&

fs/xfs/scrub/rtbitmap.c

+2 −2
Original line number Diff line number Diff line
@@ -48,12 +48,12 @@ xchk_rtbitmap_rec( 
{

	struct xfs_scrub	*sc = priv;

	xfs_rtblock_t		startblock;

	xfs_rtblock_t		blockcount;

	xfs_filblks_t		blockcount;



	startblock = rec->ar_startext * mp->m_sb.sb_rextsize;

	blockcount = rec->ar_extcount * mp->m_sb.sb_rextsize;



	if (!xfs_verify_rtext(mp, startblock, blockcount))

	if (!xfs_verify_rtbext(mp, startblock, blockcount))

		xchk_fblock_set_corrupt(sc, XFS_DATA_FORK, 0);

	return 0;

}