iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: remove XFS_RTMIN/XFS_RTMAX

Browse Source 
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>
This commit is contained in:
Christoph Hellwig
2023-12-18 05:57:34 +01:00
committed by Chandan Babu R
parent 3abfe6c275
commit a39f5ccc30
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/xfs/libxfs/xfs_format.h
View File

@@ -1156,12 +1156,6 @@ static inline bool xfs_dinode_has_large_extent_counts(
#define XFS_DFL_RTEXTSIZE (64 * 1024) /* 64kB */ #define XFS_DFL_RTEXTSIZE (64 * 1024) /* 64kB */
#define XFS_MIN_RTEXTSIZE (4 * 1024) /* 4kB */ #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 * Dquot and dquot block format definitions
*/ */

8
fs/xfs/libxfs/xfs_rtbitmap.c
View File

@@ -184,7 +184,7 @@ xfs_rtfind_back(
* Calculate first (leftmost) bit number to look at, * Calculate first (leftmost) bit number to look at,
* and mask for all the relevant bits in this word. * 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) << mask = (((xfs_rtword_t)1 << (bit - firstbit + 1)) - 1) <<
firstbit; firstbit;
/* /*
@@ -338,7 +338,7 @@ xfs_rtfind_forw(
* Calculate last (rightmost) bit number to look at, * Calculate last (rightmost) bit number to look at,
* and mask for all the relevant bits in this word. * 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; mask = (((xfs_rtword_t)1 << (lastbit - bit)) - 1) << bit;
/* /*
* Calculate the difference between the value there * Calculate the difference between the value there
@@ -573,7 +573,7 @@ xfs_rtmodify_range(
/* /*
* Compute first bit not changed and mask of relevant bits. * 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; mask = (((xfs_rtword_t)1 << (lastbit - bit)) - 1) << bit;
/* /*
* Set/clear the active bits. * Set/clear the active bits.
@@ -787,7 +787,7 @@ xfs_rtcheck_range(
/* /*
* Compute first bit not examined. * Compute first bit not examined.
*/ */
lastbit = XFS_RTMIN(bit + len, XFS_NBWORD); lastbit = min(bit + len, XFS_NBWORD);
/* /*
* Mask of relevant bits. * Mask of relevant bits.
*/ */

7
fs/xfs/xfs_rtalloc.c
View File

@@ -638,9 +638,10 @@ xfs_rtallocate_extent_size(
* for this summary level. * for this summary level.
*/ */
for (l = xfs_highbit32(maxlen); l >= xfs_highbit32(minlen); l--) { for (l = xfs_highbit32(maxlen); l >= xfs_highbit32(minlen); l--) {
error = xfs_rtalloc_sumlevel(args, l, XFS_RTMAX(minlen, 1 << l), error = xfs_rtalloc_sumlevel(args, l,
XFS_RTMIN(maxlen, (1 << (l + 1)) - 1), prod, max_t(xfs_rtxlen_t, minlen, 1 << l),
len, rtx); min_t(xfs_rtxlen_t, maxlen, (1 << (l + 1)) - 1),
prod, len, rtx);
if (error != -ENOSPC) if (error != -ENOSPC)
return error; return error;
} }