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

xfs: remove XFS_RTMIN/XFS_RTMAX 



Use the kernel min/max helpers instead.

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 3abfe6c2

fs/xfs/libxfs/xfs_format.h

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

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



/*

 * RT bit manipulation macros.

 */

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

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



/*

 * Dquot and dquot block format definitions

 */

fs/xfs/libxfs/xfs_rtbitmap.c

+4 −4
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ xfs_rtfind_back( 
		 * Calculate first (leftmost) bit number to look at,

		 * and mask for all the relevant bits in this word.

		 */

		firstbit = XFS_RTMAX((xfs_srtblock_t)(bit - len + 1), 0);

		firstbit = max_t(xfs_srtblock_t, bit - len + 1, 0);

		mask = (((xfs_rtword_t)1 << (bit - firstbit + 1)) - 1) <<

			firstbit;

		/*
@@ -338,7 +338,7 @@ xfs_rtfind_forw( 
		 * Calculate last (rightmost) bit number to look at,

		 * and mask for all the relevant bits in this word.

		 */

		lastbit = XFS_RTMIN(bit + len, XFS_NBWORD);

		lastbit = min(bit + len, XFS_NBWORD);

		mask = (((xfs_rtword_t)1 << (lastbit - bit)) - 1) << bit;

		/*

		 * Calculate the difference between the value there
@@ -573,7 +573,7 @@ xfs_rtmodify_range( 
		/*

		 * Compute first bit not changed and mask of relevant bits.

		 */

		lastbit = XFS_RTMIN(bit + len, XFS_NBWORD);

		lastbit = min(bit + len, XFS_NBWORD);

		mask = (((xfs_rtword_t)1 << (lastbit - bit)) - 1) << bit;

		/*

		 * Set/clear the active bits.
@@ -787,7 +787,7 @@ xfs_rtcheck_range( 
		/*

		 * Compute first bit not examined.

		 */

		lastbit = XFS_RTMIN(bit + len, XFS_NBWORD);

		lastbit = min(bit + len, XFS_NBWORD);

		/*

		 * Mask of relevant bits.

		 */

fs/xfs/xfs_rtalloc.c

+4 −3
Original line number Diff line number Diff line
@@ -638,9 +638,10 @@ xfs_rtallocate_extent_size( 
	 * for this summary level.

	 */

	for (l = xfs_highbit32(maxlen); l >= xfs_highbit32(minlen); l--) {

		error = xfs_rtalloc_sumlevel(args, l, XFS_RTMAX(minlen, 1 << l),

				XFS_RTMIN(maxlen, (1 << (l + 1)) - 1), prod,

				len, rtx);

		error = xfs_rtalloc_sumlevel(args, l,

				max_t(xfs_rtxlen_t, minlen, 1 << l),

				min_t(xfs_rtxlen_t, maxlen, (1 << (l + 1)) - 1),

				prod, len, rtx);

		if (error != -ENOSPC)

			return error;

	}