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

xfs: remove XFS_BLOCKWSIZE and XFS_BLOCKWMASK macros 



Remove these trivial macros since they're not even part of the ondisk
format.

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

fs/xfs/libxfs/xfs_format.h

+0 −2
Original line number Diff line number Diff line
@@ -1142,8 +1142,6 @@ static inline bool xfs_dinode_has_large_extent_counts( 


#define	XFS_BLOCKSIZE(mp)	((mp)->m_sb.sb_blocksize)

#define	XFS_BLOCKMASK(mp)	((mp)->m_blockmask)

#define	XFS_BLOCKWSIZE(mp)	((mp)->m_blockwsize)

#define	XFS_BLOCKWMASK(mp)	((mp)->m_blockwmask)



/*

 * RT Summary and bit manipulation macros.

fs/xfs/libxfs/xfs_rtbitmap.c

+8 −8
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ xfs_rtfind_back( 
				return error;

			}

			bufp = bp->b_addr;

			word = XFS_BLOCKWMASK(mp);

			word = mp->m_blockwsize - 1;

			b = &bufp[word];

		} else {

			/*
@@ -220,7 +220,7 @@ xfs_rtfind_back( 
				return error;

			}

			bufp = bp->b_addr;

			word = XFS_BLOCKWMASK(mp);

			word = mp->m_blockwsize - 1;

			b = &bufp[word];

		} else {

			/*
@@ -338,7 +338,7 @@ xfs_rtfind_forw( 
		 * Go on to next block if that's where the next word is

		 * and we need the next word.

		 */

		if (++word == XFS_BLOCKWSIZE(mp) && i < len) {

		if (++word == mp->m_blockwsize && i < len) {

			/*

			 * If done with this block, get the previous one.

			 */
@@ -383,7 +383,7 @@ xfs_rtfind_forw( 
		 * Go on to next block if that's where the next word is

		 * and we need the next word.

		 */

		if (++word == XFS_BLOCKWSIZE(mp) && i < len) {

		if (++word == mp->m_blockwsize && i < len) {

			/*

			 * If done with this block, get the next one.

			 */
@@ -593,7 +593,7 @@ xfs_rtmodify_range( 
		 * Go on to the next block if that's where the next word is

		 * and we need the next word.

		 */

		if (++word == XFS_BLOCKWSIZE(mp) && i < len) {

		if (++word == mp->m_blockwsize && i < len) {

			/*

			 * Log the changed part of this block.

			 * Get the next one.
@@ -633,7 +633,7 @@ xfs_rtmodify_range( 
		 * Go on to the next block if that's where the next word is

		 * and we need the next word.

		 */

		if (++word == XFS_BLOCKWSIZE(mp) && i < len) {

		if (++word == mp->m_blockwsize && i < len) {

			/*

			 * Log the changed part of this block.

			 * Get the next one.
@@ -836,7 +836,7 @@ xfs_rtcheck_range( 
		 * Go on to next block if that's where the next word is

		 * and we need the next word.

		 */

		if (++word == XFS_BLOCKWSIZE(mp) && i < len) {

		if (++word == mp->m_blockwsize && i < len) {

			/*

			 * If done with this block, get the next one.

			 */
@@ -882,7 +882,7 @@ xfs_rtcheck_range( 
		 * Go on to next block if that's where the next word is

		 * and we need the next word.

		 */

		if (++word == XFS_BLOCKWSIZE(mp) && i < len) {

		if (++word == mp->m_blockwsize && i < len) {

			/*

			 * If done with this block, get the next one.

			 */

fs/xfs/libxfs/xfs_rtbitmap.h

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ xfs_rtx_to_rbmword( 
	struct xfs_mount	*mp,

	xfs_rtxnum_t		rtx)

{

	return (rtx >> XFS_NBWORDLOG) & XFS_BLOCKWMASK(mp);

	return (rtx >> XFS_NBWORDLOG) & (mp->m_blockwsize - 1);

}



/* Convert a file block offset in the rt bitmap file to an rt extent number. */