Skip to contentSkip to conversation

fs/xfs: Handcrafted MIN/MAX macro removal

PATCH In review Amol Lad 3 participants 3 messages Oct 18, 2006 – Oct 19, 2006 XFS filesystem

lore
Share & tools
lore

Amol Lad

author
#0 lore raw

PATCH 1/1 fs/xfs: Handcrafted MIN/MAX macro removal

Cleanups done to use min/max macros from kernel.h. Handcrafted MIN/MAX macros are changed to use macros in kernel.h

Tested using allmodconfig

---
xfs_btree.h | 34 ++++++++++------------------------
xfs_rtalloc.c | 20 ++++++++++----------
xfs_rtalloc.h | 3 ---
---

fs/xfs/xfs_btree.h +10 -24
diff -uprN -X linux-2.6.19-rc2-orig/Documentation/dontdiff linux-2.6.19-rc2-orig/fs/xfs/xfs_btree.h linux-2.6.19-rc2/fs/xfs/xfs_btree.h
@@ -18,6 +18,8 @@
 #ifndef __XFS_BTREE_H__
 #define	__XFS_BTREE_H__
 
+#include <linux/kernel.h>
+
 struct xfs_buf;
 struct xfs_bmap_free;
 struct xfs_inode;
@@ -444,30 +446,14 @@ xfs_btree_setbuf(
 /*
  * Min and max functions for extlen, agblock, fileoff, and filblks types.
  */
-#define	XFS_EXTLEN_MIN(a,b)	\
-	((xfs_extlen_t)(a) < (xfs_extlen_t)(b) ? \
-		(xfs_extlen_t)(a) : (xfs_extlen_t)(b))
-#define	XFS_EXTLEN_MAX(a,b)	\
-	((xfs_extlen_t)(a) > (xfs_extlen_t)(b) ? \
-		(xfs_extlen_t)(a) : (xfs_extlen_t)(b))
-#define	XFS_AGBLOCK_MIN(a,b)	\
-	((xfs_agblock_t)(a) < (xfs_agblock_t)(b) ? \
-		(xfs_agblock_t)(a) : (xfs_agblock_t)(b))
-#define	XFS_AGBLOCK_MAX(a,b)	\
-	((xfs_agblock_t)(a) > (xfs_agblock_t)(b) ? \
-		(xfs_agblock_t)(a) : (xfs_agblock_t)(b))
-#define	XFS_FILEOFF_MIN(a,b)	\
-	((xfs_fileoff_t)(a) < (xfs_fileoff_t)(b) ? \
-		(xfs_fileoff_t)(a) : (xfs_fileoff_t)(b))
-#define	XFS_FILEOFF_MAX(a,b)	\
-	((xfs_fileoff_t)(a) > (xfs_fileoff_t)(b) ? \
-		(xfs_fileoff_t)(a) : (xfs_fileoff_t)(b))
-#define	XFS_FILBLKS_MIN(a,b)	\
-	((xfs_filblks_t)(a) < (xfs_filblks_t)(b) ? \
-		(xfs_filblks_t)(a) : (xfs_filblks_t)(b))
-#define	XFS_FILBLKS_MAX(a,b)	\
-	((xfs_filblks_t)(a) > (xfs_filblks_t)(b) ? \
-		(xfs_filblks_t)(a) : (xfs_filblks_t)(b))
+#define	XFS_EXTLEN_MIN(a,b)   (min_t(xfs_extlen_t,a,b))
+#define	XFS_EXTLEN_MAX(a,b)	  (max_t(xfs_extlen_t,a,b))
+#define	XFS_AGBLOCK_MIN(a,b)  (min_t(xfs_agblock_t,a,b))
+#define	XFS_AGBLOCK_MAX(a,b)  (max_t(xfs_agblock_t,a,b))
+#define	XFS_FILEOFF_MIN(a,b)  (min_t(xfs_fileoff_t,a,b))
+#define	XFS_FILEOFF_MAX(a,b)  (max_t(xfs_fileoff_t,a,b))
+#define	XFS_FILBLKS_MIN(a,b)  (min_t(xfs_filblks_t,a,b))
+#define	XFS_FILBLKS_MAX(a,b)  (max_t(xfs_filblks_t,a,b))
 
 #define	XFS_FSB_SANITY_CHECK(mp,fsb)	\
 	(XFS_FSB_TO_AGNO(mp, fsb) < mp->m_sb.sb_agcount && \
fs/xfs/xfs_rtalloc.c +10 -10
diff -uprN -X linux-2.6.19-rc2-orig/Documentation/dontdiff linux-2.6.19-rc2-orig/fs/xfs/xfs_rtalloc.c linux-2.6.19-rc2/fs/xfs/xfs_rtalloc.c
@@ -699,8 +699,8 @@ xfs_rtallocate_extent_size(
 			 * this summary level.
 			 */
 			error = xfs_rtallocate_extent_block(mp, tp, i,
-					XFS_RTMAX(minlen, 1 << l),
-					XFS_RTMIN(maxlen, (1 << (l + 1)) - 1),
+					max(minlen, (xfs_extlen_t)(1 << l)),
+					min(maxlen, (xfs_extlen_t)((1 << (l + 1)) - 1)),
 					len, &n, rbpp, rsb, prod, &r);
 			if (error) {
 				return error;
@@ -1020,7 +1020,7 @@ xfs_rtcheck_range(
 		/*
 		 * Compute first bit not examined.
 		 */
-		lastbit = XFS_RTMIN(bit + len, XFS_NBWORD);
+		lastbit = min(bit + len, (xfs_extlen_t)XFS_NBWORD);
 		/*
 		 * Mask of relevant bits.
 		 */
@@ -1238,7 +1238,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((xfs_srtblock_t)(bit - len + 1), (xfs_srtblock_t)0);
 		mask = (((xfs_rtword_t)1 << (bit - firstbit + 1)) - 1) <<
 			firstbit;
 		/*
@@ -1413,7 +1413,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_rtblock_t)XFS_NBWORD);
 		mask = (((xfs_rtword_t)1 << (lastbit - bit)) - 1) << bit;
 		/*
 		 * Calculate the difference between the value there
@@ -1724,7 +1724,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_extlen_t)XFS_NBWORD);
 		mask = (((xfs_rtword_t)1 << (lastbit - bit)) - 1) << bit;
 		/*
 		 * Set/clear the active bits.
@@ -1998,9 +1998,9 @@ xfs_growfs_rt(
 		nsbp->sb_rextsize = in->extsize;
 		nsbp->sb_rbmblocks = bmbno + 1;
 		nsbp->sb_rblocks =
-			XFS_RTMIN(nrblocks,
-				  nsbp->sb_rbmblocks * NBBY *
-				  nsbp->sb_blocksize * nsbp->sb_rextsize);
+			min(nrblocks,
+				  (xfs_drfsbno_t)(nsbp->sb_rbmblocks * NBBY *
+				  nsbp->sb_blocksize * nsbp->sb_rextsize));
 		nsbp->sb_rextents = nsbp->sb_rblocks;
 		do_div(nsbp->sb_rextents, nsbp->sb_rextsize);
 		nsbp->sb_rextslog = xfs_highbit32(nsbp->sb_rextents);
@@ -2424,7 +2424,7 @@ xfs_rtprint_summary(
 			if (c) {
 				if (!p) {
 					cmn_err(CE_DEBUG, "%Ld-%Ld:", 1LL << l,
-						XFS_RTMIN((1LL << l) +
+						min((1LL << l) +
 							  ((1LL << l) - 1LL),
 							 mp->m_sb.sb_rextents));
 					p = 1;
fs/xfs/xfs_rtalloc.h +0 -3
diff -uprN -X linux-2.6.19-rc2-orig/Documentation/dontdiff linux-2.6.19-rc2-orig/fs/xfs/xfs_rtalloc.h linux-2.6.19-rc2/fs/xfs/xfs_rtalloc.h
@@ -57,9 +57,6 @@ struct xfs_trans;
 #define	XFS_BITTOWORD(mp,bi)	\
 	((int)(((bi) >> XFS_NBWORDLOG) & XFS_BLOCKWMASK(mp)))
 
-#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)
 
#1 lore raw

fs/xfs/xfs_btree.h line 22

Quoted 8 lines · Amol Lad
fs/xfs/xfs_btree.h +2 -0
@@ -18,6 +18,8 @@
 #ifndef __XFS_BTREE_H__
 #define	__XFS_BTREE_H__
 
+#include <linux/kernel.h>
+

This file is also used in libxfs, so you can't just include this header directly. On the other hand it should always get kernel.h through xfs_linux.h anyway so you might aswell just leave the include out.

fs/xfs/xfs_btree.h xfs_btree_setbuf( · line 456

Quoted 8 lines
fs/xfs/xfs_btree.h +8 -0
+#define	XFS_EXTLEN_MIN(a,b)   (min_t(xfs_extlen_t,a,b))
+#define	XFS_EXTLEN_MAX(a,b)	  (max_t(xfs_extlen_t,a,b))
+#define	XFS_AGBLOCK_MIN(a,b)  (min_t(xfs_agblock_t,a,b))
+#define	XFS_AGBLOCK_MAX(a,b)  (max_t(xfs_agblock_t,a,b))
+#define	XFS_FILEOFF_MIN(a,b)  (min_t(xfs_fileoff_t,a,b))
+#define	XFS_FILEOFF_MAX(a,b)  (max_t(xfs_fileoff_t,a,b))
+#define	XFS_FILBLKS_MIN(a,b)  (min_t(xfs_filblks_t,a,b))
+#define	XFS_FILBLKS_MAX(a,b)  (max_t(xfs_filblks_t,a,b))

At this point we might aswell kill these UGLY SHOUTING macros and use min_t/max_t (or just min/max where appropinquate) directly.

fs/xfs/xfs_btree.h

Quoted 5 lines
fs/xfs/xfs_btree.h +2 -2
 			error = xfs_rtallocate_extent_block(mp, tp, i,
-					XFS_RTMAX(minlen, 1 << l),
-					XFS_RTMIN(maxlen, (1 << (l + 1)) - 1),
+					max(minlen, (xfs_extlen_t)(1 << l)),
+					min(maxlen, (xfs_extlen_t)((1 << (l + 1)) - 1)),

these would be a lot more readable as

					max_t(xfs_extlen_t, minlen, (1 << l)),
					min_t(xfs_extlen_t, maxlen,
					      ((1 << (l + 1)) - 1)),

wouldn, it?

Quoted 8 lines
fs/xfs/xfs_btree.h +3 -3
-		lastbit = XFS_RTMIN(bit + len, XFS_NBWORD);
+		lastbit = min(bit + len, (xfs_extlen_t)XFS_NBWORD);
 
-		firstbit = XFS_RTMAX((xfs_srtblock_t)(bit - len + 1), 0);
+		firstbit = max((xfs_srtblock_t)(bit - len + 1), (xfs_srtblock_t)0);
 
-		lastbit = XFS_RTMIN(bit + len, XFS_NBWORD);
+		lastbit = min(bit + len, (xfs_rtblock_t)XFS_NBWORD);

fs/xfs/xfs_btree.h

Quoted 10 lines
fs/xfs/xfs_btree.h +4 -4
 
-		lastbit = XFS_RTMIN(bit + len, XFS_NBWORD);
+		lastbit = min(bit + len, (xfs_extlen_t)XFS_NBWORD);
 
-			XFS_RTMIN(nrblocks,
-				  nsbp->sb_rbmblocks * NBBY *
-				  nsbp->sb_blocksize * nsbp->sb_rextsize);
+			min(nrblocks,
+				  (xfs_drfsbno_t)(nsbp->sb_rbmblocks * NBBY *
+				  nsbp->sb_blocksize * nsbp->sb_rextsize));

ditto

#2 lore raw
Quoted 7 lines · Christoph Hellwig
Quoted 6 lines · Amol Lad
fs/xfs/xfs_btree.h +0 -0
@@ -18,6 +18,8 @@
 #ifndef __XFS_BTREE_H__
 #define	__XFS_BTREE_H__
 
Quoted 6 lines

fs/xfs/xfs_btree.h line 22

Quoted 2 lines
fs/xfs/xfs_btree.h +2 -0
+#include <linux/kernel.h>
+

This file is also used in libxfs, so you can't just include this header directly. On the other hand it should always get kernel.h through xfs_linux.h anyway so you might aswell just leave the include out.

*nod* - the include is not needed here.

Quoted 11 lines

fs/xfs/xfs_btree.h xfs_btree_setbuf( · line 456

Quoted 8 lines
fs/xfs/xfs_btree.h +8 -0
+#define	XFS_EXTLEN_MIN(a,b)   (min_t(xfs_extlen_t,a,b))
+#define	XFS_EXTLEN_MAX(a,b)	  (max_t(xfs_extlen_t,a,b))
+#define	XFS_AGBLOCK_MIN(a,b)  (min_t(xfs_agblock_t,a,b))
+#define	XFS_AGBLOCK_MAX(a,b)  (max_t(xfs_agblock_t,a,b))
+#define	XFS_FILEOFF_MIN(a,b)  (min_t(xfs_fileoff_t,a,b))
+#define	XFS_FILEOFF_MAX(a,b)  (max_t(xfs_fileoff_t,a,b))
+#define	XFS_FILBLKS_MIN(a,b)  (min_t(xfs_filblks_t,a,b))
+#define	XFS_FILBLKS_MAX(a,b)  (max_t(xfs_filblks_t,a,b))

At this point we might aswell kill these UGLY SHOUTING macros and use min_t/max_t (or just min/max where appropinquate) directly.

No way.

Quoted 8 lines

fs/xfs/xfs_btree.h

Quoted 5 lines
fs/xfs/xfs_btree.h +2 -2
 			error = xfs_rtallocate_extent_block(mp, tp, i,
-					XFS_RTMAX(minlen, 1 << l),
-					XFS_RTMIN(maxlen, (1 << (l + 1)) - 1),
+					max(minlen, (xfs_extlen_t)(1 << l)),
+					min(maxlen, (xfs_extlen_t)((1 << (l + 1)) - 1)),

these would be a lot more readable as

Quoted 5 lines
					max_t(xfs_extlen_t, minlen, (1 << l)),
					min_t(xfs_extlen_t, maxlen,
					      ((1 << (l + 1)) - 1)),

wouldn, it?

No. I look at that XFS_RTMAX() macro and I *know* we are doing the correct compare for that type of object. I look at the max_t version and think to myself "is that correct, or is it done differently elsewhere?". That macro says "I'm doing the right thing", and that is invaluable information when it comes to reading the code and tracking down bugs.

By removing the macros completely, we no longer know exactly where in the code we compare distinct types, nor do we have a consistent manner in which to compare them. When it comes to doing future mods, we're now completely reliant on the developer finding all the places we compare the distinct types and/or adding new compares using the same code. This is a Bad Thing.

So while I'm happy with the original patch that just changes the macro implementation (minus the include), I really dislike the followup patch that removes the macros altogether because of these reasons.

Cheers,

Dave.

Signature · 3 lines
Dave Chinner
Principal Engineer
SGI Australian Software Group