xfs: remove XFS_RTMIN/XFS_RTMAX

Use the kernel min/max helpers instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>

diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
index 7d2873a79a48a5cc538dad1499637c76547f4fd7..382ab1e71c0b6c43b74a937ed9e935967253a858 100644 (file)
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/libxfs/xfs_format.h
@@ -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
  */

diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c
index 4185ccf83bab689d88e1d33680c2a89472cd6966..31100120b2c586bbcfb5ee3d1d413926400e215a 100644 (file)
--- a/fs/xfs/libxfs/xfs_rtbitmap.c
+++ b/fs/xfs/libxfs/xfs_rtbitmap.c
@@ -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.
                 */

diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
index be93542827cfd8abedee621fcf6de1c1be3d51c7..4b8fc8e510ac85689a2058577db569742a23e494 100644 (file)
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -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;
        }