Commit 3abfe6c2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Chandan Babu R
Browse files

xfs: remove rt-wrappers from xfs_format.h 



xfs_format.h has a bunch odd wrappers for helper functions and mount
structure access using RT* prefixes.  Replace them with their open coded
versions (for those that weren't entirely unused) and remove the wrappers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatar"Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandanbabu@kernel.org>
parent 8ceee72f

fs/xfs/libxfs/xfs_format.h

+0 −8
Original line number Diff line number Diff line
@@ -1156,20 +1156,12 @@ static inline bool xfs_dinode_has_large_extent_counts( 
#define	XFS_DFL_RTEXTSIZE	(64 * 1024)	        /* 64kB */

#define	XFS_MIN_RTEXTSIZE	(4 * 1024)		/* 4kB */



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

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



/*

 * RT bit manipulation macros.

 */

#define	XFS_RTMIN(a,b)	((a) < (b) ? (a) : (b))

#define	XFS_RTMAX(a,b)	((a) > (b) ? (a) : (b))



#define	XFS_RTLOBIT(w)	xfs_lowbit32(w)

#define	XFS_RTHIBIT(w)	xfs_highbit32(w)



#define	XFS_RTBLOCKLOG(b)	xfs_highbit64(b)



/*

 * Dquot and dquot block format definitions

 */

fs/xfs/libxfs/xfs_rtbitmap.c

+12 −12
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ xfs_rtfind_back( 
			/*

			 * Different.  Mark where we are and return.

			 */

			i = bit - XFS_RTHIBIT(wdiff);

			i = bit - xfs_highbit32(wdiff);

			*rtx = start - i + 1;

			return 0;

		}
@@ -233,7 +233,7 @@ xfs_rtfind_back( 
			/*

			 * Different, mark where we are and return.

			 */

			i += XFS_NBWORD - 1 - XFS_RTHIBIT(wdiff);

			i += XFS_NBWORD - 1 - xfs_highbit32(wdiff);

			*rtx = start - i + 1;

			return 0;

		}
@@ -272,7 +272,7 @@ xfs_rtfind_back( 
			/*

			 * Different, mark where we are and return.

			 */

			i += XFS_NBWORD - 1 - XFS_RTHIBIT(wdiff);

			i += XFS_NBWORD - 1 - xfs_highbit32(wdiff);

			*rtx = start - i + 1;

			return 0;

		} else
@@ -348,7 +348,7 @@ xfs_rtfind_forw( 
			/*

			 * Different.  Mark where we are and return.

			 */

			i = XFS_RTLOBIT(wdiff) - bit;

			i = xfs_lowbit32(wdiff) - bit;

			*rtx = start + i - 1;

			return 0;

		}
@@ -386,7 +386,7 @@ xfs_rtfind_forw( 
			/*

			 * Different, mark where we are and return.

			 */

			i += XFS_RTLOBIT(wdiff);

			i += xfs_lowbit32(wdiff);

			*rtx = start + i - 1;

			return 0;

		}
@@ -423,7 +423,7 @@ xfs_rtfind_forw( 
			/*

			 * Different, mark where we are and return.

			 */

			i += XFS_RTLOBIT(wdiff);

			i += xfs_lowbit32(wdiff);

			*rtx = start + i - 1;

			return 0;

		} else
@@ -708,7 +708,7 @@ xfs_rtfree_range( 
	 */

	if (preblock < start) {

		error = xfs_rtmodify_summary(args,

				XFS_RTBLOCKLOG(start - preblock),

				xfs_highbit64(start - preblock),

				xfs_rtx_to_rbmblock(mp, preblock), -1);

		if (error) {

			return error;
@@ -720,7 +720,7 @@ xfs_rtfree_range( 
	 */

	if (postblock > end) {

		error = xfs_rtmodify_summary(args,

				XFS_RTBLOCKLOG(postblock - end),

				xfs_highbit64(postblock - end),

				xfs_rtx_to_rbmblock(mp, end + 1), -1);

		if (error) {

			return error;
@@ -731,7 +731,7 @@ xfs_rtfree_range( 
	 * (new) free extent.

	 */

	return xfs_rtmodify_summary(args,

			XFS_RTBLOCKLOG(postblock + 1 - preblock),

			xfs_highbit64(postblock + 1 - preblock),

			xfs_rtx_to_rbmblock(mp, preblock), 1);

}
@@ -800,7 +800,7 @@ xfs_rtcheck_range( 
			/*

			 * Different, compute first wrong bit and return.

			 */

			i = XFS_RTLOBIT(wdiff) - bit;

			i = xfs_lowbit32(wdiff) - bit;

			*new = start + i;

			*stat = 0;

			return 0;
@@ -839,7 +839,7 @@ xfs_rtcheck_range( 
			/*

			 * Different, compute first wrong bit and return.

			 */

			i += XFS_RTLOBIT(wdiff);

			i += xfs_lowbit32(wdiff);

			*new = start + i;

			*stat = 0;

			return 0;
@@ -877,7 +877,7 @@ xfs_rtcheck_range( 
			/*

			 * Different, compute first wrong bit and return.

			 */

			i += XFS_RTLOBIT(wdiff);

			i += xfs_lowbit32(wdiff);

			*new = start + i;

			*stat = 0;

			return 0;

fs/xfs/scrub/rtsummary.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ xchk_rtsum_record_free( 


	/* Compute the relevant location in the rtsum file. */

	rbmoff = xfs_rtx_to_rbmblock(mp, rec->ar_startext);

	lenlog = XFS_RTBLOCKLOG(rec->ar_extcount);

	lenlog = xfs_highbit64(rec->ar_extcount);

	offs = xfs_rtsumoffs(mp, lenlog, rbmoff);



	rtbno = xfs_rtx_to_rtb(mp, rec->ar_startext);

fs/xfs/xfs_rtalloc.c

+3 −3
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ xfs_rtallocate_range( 
	 * (old) free extent.

	 */

	error = xfs_rtmodify_summary(args,

			XFS_RTBLOCKLOG(postblock + 1 - preblock),

			xfs_highbit64(postblock + 1 - preblock),

			xfs_rtx_to_rbmblock(mp, preblock), -1);

	if (error)

		return error;
@@ -167,7 +167,7 @@ xfs_rtallocate_range( 
	 */

	if (preblock < start) {

		error = xfs_rtmodify_summary(args,

				XFS_RTBLOCKLOG(start - preblock),

				xfs_highbit64(start - preblock),

				xfs_rtx_to_rbmblock(mp, preblock), 1);

		if (error)

			return error;
@@ -179,7 +179,7 @@ xfs_rtallocate_range( 
	 */

	if (postblock > end) {

		error = xfs_rtmodify_summary(args,

				XFS_RTBLOCKLOG(postblock - end),

				xfs_highbit64(postblock - end),

				xfs_rtx_to_rbmblock(mp, end + 1), 1);

		if (error)

			return error;