Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 54aa8e26e90da882b145fcd33ed752431d6b318b

Authored by David Chinner
Committed by Tim Shimmin
1 parent 24ad33ff71
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[XFS] Simplify XFS min/max macros. 

SGI-PV: 964547
SGI-Modid: xfs-linux-melb:xfs-kern:28945a

Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Nathan Scott <nscott@aconex.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

Showing 1 changed file with 8 additions and 24 deletions Side-by-side Diff

... ... @@ -444,30 +444,14 @@
444 444 /*
445 445 * Min and max functions for extlen, agblock, fileoff, and filblks types.
446 446 */
447   -#define XFS_EXTLEN_MIN(a,b) \
448   - ((xfs_extlen_t)(a) < (xfs_extlen_t)(b) ? \
449   - (xfs_extlen_t)(a) : (xfs_extlen_t)(b))
450   -#define XFS_EXTLEN_MAX(a,b) \
451   - ((xfs_extlen_t)(a) > (xfs_extlen_t)(b) ? \
452   - (xfs_extlen_t)(a) : (xfs_extlen_t)(b))
453   -#define XFS_AGBLOCK_MIN(a,b) \
454   - ((xfs_agblock_t)(a) < (xfs_agblock_t)(b) ? \
455   - (xfs_agblock_t)(a) : (xfs_agblock_t)(b))
456   -#define XFS_AGBLOCK_MAX(a,b) \
457   - ((xfs_agblock_t)(a) > (xfs_agblock_t)(b) ? \
458   - (xfs_agblock_t)(a) : (xfs_agblock_t)(b))
459   -#define XFS_FILEOFF_MIN(a,b) \
460   - ((xfs_fileoff_t)(a) < (xfs_fileoff_t)(b) ? \
461   - (xfs_fileoff_t)(a) : (xfs_fileoff_t)(b))
462   -#define XFS_FILEOFF_MAX(a,b) \
463   - ((xfs_fileoff_t)(a) > (xfs_fileoff_t)(b) ? \
464   - (xfs_fileoff_t)(a) : (xfs_fileoff_t)(b))
465   -#define XFS_FILBLKS_MIN(a,b) \
466   - ((xfs_filblks_t)(a) < (xfs_filblks_t)(b) ? \
467   - (xfs_filblks_t)(a) : (xfs_filblks_t)(b))
468   -#define XFS_FILBLKS_MAX(a,b) \
469   - ((xfs_filblks_t)(a) > (xfs_filblks_t)(b) ? \
470   - (xfs_filblks_t)(a) : (xfs_filblks_t)(b))
  447 +#define XFS_EXTLEN_MIN(a,b) min_t(xfs_extlen_t, (a), (b))
  448 +#define XFS_EXTLEN_MAX(a,b) max_t(xfs_extlen_t, (a), (b))
  449 +#define XFS_AGBLOCK_MIN(a,b) min_t(xfs_agblock_t, (a), (b))
  450 +#define XFS_AGBLOCK_MAX(a,b) max_t(xfs_agblock_t, (a), (b))
  451 +#define XFS_FILEOFF_MIN(a,b) min_t(xfs_fileoff_t, (a), (b))
  452 +#define XFS_FILEOFF_MAX(a,b) max_t(xfs_fileoff_t, (a), (b))
  453 +#define XFS_FILBLKS_MIN(a,b) min_t(xfs_filblks_t, (a), (b))
  454 +#define XFS_FILBLKS_MAX(a,b) max_t(xfs_filblks_t, (a), (b))
471 455  
472 456 #define XFS_FSB_SANITY_CHECK(mp,fsb) \
473 457 (XFS_FSB_TO_AGNO(mp, fsb) < mp->m_sb.sb_agcount && \