Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c36dded authored by Eric Sandeen's avatar Eric Sandeen Committed by Tim Shimmin
Browse files

[XFS] Remove unused arguments from the XFS_BTREE_*_ADDR macros. 



It makes it incrementally clearer to read the code when the top of a macro
spaghetti-pile only receives the 3 arguments it uses, rather than 2 extra
ones which are not used. Also when you start pulling this thread out of
the sweater (i.e. remove unused args from XFS_BTREE_*_ADDR), a couple
other third arms etc fall off too. If they're not used in the macro, then
they sometimes don't need to be passed to the function calling the macro
either, etc....

Patch provided by Eric Sandeen (sandeen@sandeen.net).

SGI-PV: 960197
SGI-Modid: xfs-linux-melb:xfs-kern:28037a

Signed-off-by: default avatarEric Sandeen <sandeen@sandeen.net>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 7bc5306d

fs/xfs/xfs_alloc_btree.h

+3 −7
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ typedef struct xfs_btree_sblock xfs_alloc_block_t; 
/*

 * Real block structures have a size equal to the disk block size.

 */

#define	XFS_ALLOC_BLOCK_SIZE(lev,cur)	(1 << (cur)->bc_blocklog)

#define	XFS_ALLOC_BLOCK_MAXRECS(lev,cur) ((cur)->bc_mp->m_alloc_mxr[lev != 0])

#define	XFS_ALLOC_BLOCK_MINRECS(lev,cur) ((cur)->bc_mp->m_alloc_mnr[lev != 0])
@@ -87,16 +86,13 @@ typedef struct xfs_btree_sblock xfs_alloc_block_t; 
 * Record, key, and pointer address macros for btree blocks.

 */

#define	XFS_ALLOC_REC_ADDR(bb,i,cur)	\

	XFS_BTREE_REC_ADDR(XFS_ALLOC_BLOCK_SIZE(0,cur), xfs_alloc, \

				bb, i, XFS_ALLOC_BLOCK_MAXRECS(0, cur))

	XFS_BTREE_REC_ADDR(xfs_alloc, bb, i)



#define	XFS_ALLOC_KEY_ADDR(bb,i,cur)	\

	XFS_BTREE_KEY_ADDR(XFS_ALLOC_BLOCK_SIZE(1,cur), xfs_alloc, \

				bb, i, XFS_ALLOC_BLOCK_MAXRECS(1, cur))

	XFS_BTREE_KEY_ADDR(xfs_alloc, bb, i)



#define	XFS_ALLOC_PTR_ADDR(bb,i,cur)	\

	XFS_BTREE_PTR_ADDR(XFS_ALLOC_BLOCK_SIZE(1,cur), xfs_alloc, \

				bb, i, XFS_ALLOC_BLOCK_MAXRECS(1, cur))

	XFS_BTREE_PTR_ADDR(xfs_alloc, bb, i, XFS_ALLOC_BLOCK_MAXRECS(1, cur))



/*

 * Decrement cursor by one record at the level.

fs/xfs/xfs_bmap.c

+12 −23
Original line number Diff line number Diff line
@@ -410,7 +410,6 @@ xfs_bmap_count_leaves( 
STATIC int

xfs_bmap_disk_count_leaves(

	xfs_ifork_t		*ifp,

	xfs_mount_t		*mp,

	xfs_extnum_t		idx,

	xfs_bmbt_block_t	*block,

	int			numrecs,
@@ -4533,8 +4532,7 @@ xfs_bmap_read_extents( 
			error0);

		if (level == 0)

			break;

		pp = XFS_BTREE_PTR_ADDR(mp->m_sb.sb_blocksize, xfs_bmbt, block,

			1, mp->m_bmap_dmxr[1]);

		pp = XFS_BTREE_PTR_ADDR(xfs_bmbt, block, 1, mp->m_bmap_dmxr[1]);

		bno = be64_to_cpu(*pp);

		XFS_WANT_CORRUPTED_GOTO(XFS_FSB_SANITY_CHECK(mp, bno), error0);

		xfs_trans_brelse(tp, bp);
@@ -4577,8 +4575,7 @@ xfs_bmap_read_extents( 
		/*

		 * Copy records into the extent records.

		 */

		frp = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize, xfs_bmbt,

			block, 1, mp->m_bmap_dmxr[0]);

		frp = XFS_BTREE_REC_ADDR(xfs_bmbt, block, 1);

		start = i;

		for (j = 0; j < num_recs; j++, i++, frp++) {

			trp = xfs_iext_get_ext(ifp, i);
@@ -6156,8 +6153,7 @@ xfs_check_block( 
		if (root) {

			keyp = XFS_BMAP_BROOT_KEY_ADDR(block, i, sz);

		} else {

			keyp = XFS_BTREE_KEY_ADDR(mp->m_sb.sb_blocksize,

				xfs_bmbt, block, i, dmxr);

			keyp = XFS_BTREE_KEY_ADDR(xfs_bmbt, block, i);

		}



		if (prevp) {
@@ -6172,15 +6168,14 @@ xfs_check_block( 
		if (root) {

			pp = XFS_BMAP_BROOT_PTR_ADDR(block, i, sz);

		} else {

			pp = XFS_BTREE_PTR_ADDR(mp->m_sb.sb_blocksize,

				xfs_bmbt, block, i, dmxr);

			pp = XFS_BTREE_PTR_ADDR(xfs_bmbt, block, i, dmxr);

		}

		for (j = i+1; j <= be16_to_cpu(block->bb_numrecs); j++) {

			if (root) {

				thispa = XFS_BMAP_BROOT_PTR_ADDR(block, j, sz);

			} else {

				thispa = XFS_BTREE_PTR_ADDR(mp->m_sb.sb_blocksize,

					xfs_bmbt, block, j, dmxr);

				thispa = XFS_BTREE_PTR_ADDR(xfs_bmbt, block, j,

							    dmxr);

			}

			if (*thispa == *pp) {

				cmn_err(CE_WARN, "%s: thispa(%d) == pp(%d) %Ld",
@@ -6267,8 +6262,7 @@ xfs_bmap_check_leaf_extents( 
		 */



		xfs_check_block(block, mp, 0, 0);

		pp = XFS_BTREE_PTR_ADDR(mp->m_sb.sb_blocksize, xfs_bmbt, block,

			1, mp->m_bmap_dmxr[1]);

		pp = XFS_BTREE_PTR_ADDR(xfs_bmbt, block, 1, mp->m_bmap_dmxr[1]);

		bno = be64_to_cpu(*pp);

		XFS_WANT_CORRUPTED_GOTO(XFS_FSB_SANITY_CHECK(mp, bno), error0);

		if (bp_release) {
@@ -6305,11 +6299,9 @@ xfs_bmap_check_leaf_extents( 
		 * conform with the first entry in this one.

		 */



		ep = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize, xfs_bmbt,

			block, 1, mp->m_bmap_dmxr[0]);

		ep = XFS_BTREE_REC_ADDR(xfs_bmbt, block, 1);

		for (j = 1; j < num_recs; j++) {

			nextp = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize, xfs_bmbt,

				block, j + 1, mp->m_bmap_dmxr[0]);

			nextp = XFS_BTREE_REC_ADDR(xfs_bmbt, block, j + 1);

			if (lastp) {

				xfs_btree_check_rec(XFS_BTNUM_BMAP,

					(void *)lastp, (void *)ep);
@@ -6454,8 +6446,7 @@ xfs_bmap_count_tree( 
		}



		/* Dive to the next level */

		pp = XFS_BTREE_PTR_ADDR(mp->m_sb.sb_blocksize,

			xfs_bmbt, block, 1, mp->m_bmap_dmxr[1]);

		pp = XFS_BTREE_PTR_ADDR(xfs_bmbt, block, 1, mp->m_bmap_dmxr[1]);

		bno = be64_to_cpu(*pp);

		if (unlikely((error =

		     xfs_bmap_count_tree(mp, tp, ifp, bno, level, count)) < 0)) {
@@ -6470,7 +6461,7 @@ xfs_bmap_count_tree( 
		for (;;) {

			nextbno = be64_to_cpu(block->bb_rightsib);

			numrecs = be16_to_cpu(block->bb_numrecs);

			if (unlikely(xfs_bmap_disk_count_leaves(ifp, mp,

			if (unlikely(xfs_bmap_disk_count_leaves(ifp,

					0, block, numrecs, count) < 0)) {

				xfs_trans_brelse(tp, bp);

				XFS_ERROR_REPORT("xfs_bmap_count_tree(2)",
@@ -6518,7 +6509,6 @@ xfs_bmap_count_leaves( 
int

xfs_bmap_disk_count_leaves(

	xfs_ifork_t		*ifp,

	xfs_mount_t		*mp,

	xfs_extnum_t		idx,

	xfs_bmbt_block_t	*block,

	int			numrecs,
@@ -6528,8 +6518,7 @@ xfs_bmap_disk_count_leaves( 
	xfs_bmbt_rec_t	*frp;



	for (b = 1; b <= numrecs; b++) {

		frp = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize,

			xfs_bmbt, block, idx + b, mp->m_bmap_dmxr[0]);

		frp = XFS_BTREE_REC_ADDR(xfs_bmbt, block, idx + b);

		*count += xfs_bmbt_disk_get_blockcount(frp);

	}

	return 0;

fs/xfs/xfs_bmap_btree.c

+4 −4
Original line number Diff line number Diff line
@@ -1731,9 +1731,9 @@ xfs_bmdr_to_bmbt( 
	rblock->bb_leftsib = cpu_to_be64(NULLDFSBNO);

	rblock->bb_rightsib = cpu_to_be64(NULLDFSBNO);

	dmxr = (int)XFS_BTREE_BLOCK_MAXRECS(dblocklen, xfs_bmdr, 0);

	fkp = XFS_BTREE_KEY_ADDR(dblocklen, xfs_bmdr, dblock, 1, dmxr);

	fkp = XFS_BTREE_KEY_ADDR(xfs_bmdr, dblock, 1);

	tkp = XFS_BMAP_BROOT_KEY_ADDR(rblock, 1, rblocklen);

	fpp = XFS_BTREE_PTR_ADDR(dblocklen, xfs_bmdr, dblock, 1, dmxr);

	fpp = XFS_BTREE_PTR_ADDR(xfs_bmdr, dblock, 1, dmxr);

	tpp = XFS_BMAP_BROOT_PTR_ADDR(rblock, 1, rblocklen);

	dmxr = be16_to_cpu(dblock->bb_numrecs);

	memcpy(tkp, fkp, sizeof(*fkp) * dmxr);
@@ -2684,9 +2684,9 @@ xfs_bmbt_to_bmdr( 
	dblock->bb_numrecs = rblock->bb_numrecs;

	dmxr = (int)XFS_BTREE_BLOCK_MAXRECS(dblocklen, xfs_bmdr, 0);

	fkp = XFS_BMAP_BROOT_KEY_ADDR(rblock, 1, rblocklen);

	tkp = XFS_BTREE_KEY_ADDR(dblocklen, xfs_bmdr, dblock, 1, dmxr);

	tkp = XFS_BTREE_KEY_ADDR(xfs_bmdr, dblock, 1);

	fpp = XFS_BMAP_BROOT_PTR_ADDR(rblock, 1, rblocklen);

	tpp = XFS_BTREE_PTR_ADDR(dblocklen, xfs_bmdr, dblock, 1, dmxr);

	tpp = XFS_BTREE_PTR_ADDR(xfs_bmdr, dblock, 1, dmxr);

	dmxr = be16_to_cpu(dblock->bb_numrecs);

	memcpy(tkp, fkp, sizeof(*fkp) * dmxr);

	memcpy(tpp, fpp, sizeof(*fpp) * dmxr);

fs/xfs/xfs_bmap_btree.h

+11 −35
Original line number Diff line number Diff line
@@ -175,19 +175,11 @@ typedef struct xfs_btree_lblock xfs_bmbt_block_t; 


#define XFS_BUF_TO_BMBT_BLOCK(bp)	((xfs_bmbt_block_t *)XFS_BUF_PTR(bp))



#define XFS_BMAP_IBLOCK_SIZE(lev,cur)	(1 << (cur)->bc_blocklog)

#define XFS_BMAP_RBLOCK_DSIZE(lev,cur)	((cur)->bc_private.b.forksize)

#define XFS_BMAP_RBLOCK_ISIZE(lev,cur)	\

	((int)XFS_IFORK_PTR((cur)->bc_private.b.ip, \

		    (cur)->bc_private.b.whichfork)->if_broot_bytes)



#define XFS_BMAP_BLOCK_DSIZE(lev,cur)	\

	(((lev) == (cur)->bc_nlevels - 1 ? \

		XFS_BMAP_RBLOCK_DSIZE(lev,cur) : XFS_BMAP_IBLOCK_SIZE(lev,cur)))

#define XFS_BMAP_BLOCK_ISIZE(lev,cur)	\

	(((lev) == (cur)->bc_nlevels - 1 ? \

		XFS_BMAP_RBLOCK_ISIZE(lev,cur) : XFS_BMAP_IBLOCK_SIZE(lev,cur)))



#define XFS_BMAP_BLOCK_DMAXRECS(lev,cur) \

	(((lev) == (cur)->bc_nlevels - 1 ? \

		XFS_BTREE_BLOCK_MAXRECS(XFS_BMAP_RBLOCK_DSIZE(lev,cur), \
@@ -210,37 +202,21 @@ typedef struct xfs_btree_lblock xfs_bmbt_block_t; 
				xfs_bmbt, (lev) == 0) : \

			((cur)->bc_mp->m_bmap_dmnr[(lev) != 0])))



#define XFS_BMAP_REC_DADDR(bb,i,cur)	\

	(XFS_BTREE_REC_ADDR(XFS_BMAP_BLOCK_DSIZE(			\

			be16_to_cpu((bb)->bb_level), cur),		\

			xfs_bmbt, bb, i, XFS_BMAP_BLOCK_DMAXRECS(	\

				be16_to_cpu((bb)->bb_level), cur)))

#define XFS_BMAP_REC_IADDR(bb,i,cur)	\

	(XFS_BTREE_REC_ADDR(XFS_BMAP_BLOCK_ISIZE(			\

			be16_to_cpu((bb)->bb_level), cur),		\

			xfs_bmbt, bb, i, XFS_BMAP_BLOCK_IMAXRECS(	\

				be16_to_cpu((bb)->bb_level), cur)))

#define XFS_BMAP_REC_DADDR(bb,i,cur)	(XFS_BTREE_REC_ADDR(xfs_bmbt, bb, i))



#define XFS_BMAP_REC_IADDR(bb,i,cur)	(XFS_BTREE_REC_ADDR(xfs_bmbt, bb, i))



#define XFS_BMAP_KEY_DADDR(bb,i,cur)	\

	(XFS_BTREE_KEY_ADDR(XFS_BMAP_BLOCK_DSIZE(			\

			be16_to_cpu((bb)->bb_level), cur),		\

			xfs_bmbt, bb, i, XFS_BMAP_BLOCK_DMAXRECS(	\

				be16_to_cpu((bb)->bb_level), cur)))

	(XFS_BTREE_KEY_ADDR(xfs_bmbt, bb, i))



#define XFS_BMAP_KEY_IADDR(bb,i,cur)	\

	(XFS_BTREE_KEY_ADDR(XFS_BMAP_BLOCK_ISIZE(			\

			be16_to_cpu((bb)->bb_level), cur),		\

			xfs_bmbt, bb, i, XFS_BMAP_BLOCK_IMAXRECS(	\

				be16_to_cpu((bb)->bb_level), cur)))

	(XFS_BTREE_KEY_ADDR(xfs_bmbt, bb, i))



#define XFS_BMAP_PTR_DADDR(bb,i,cur)	\

	(XFS_BTREE_PTR_ADDR(XFS_BMAP_BLOCK_DSIZE(			\

			be16_to_cpu((bb)->bb_level), cur),		\

			xfs_bmbt, bb, i, XFS_BMAP_BLOCK_DMAXRECS(	\

	(XFS_BTREE_PTR_ADDR(xfs_bmbt, bb, i, XFS_BMAP_BLOCK_DMAXRECS(	\

				be16_to_cpu((bb)->bb_level), cur)))

#define XFS_BMAP_PTR_IADDR(bb,i,cur)	\

	(XFS_BTREE_PTR_ADDR(XFS_BMAP_BLOCK_ISIZE(			\

			be16_to_cpu((bb)->bb_level), cur),		\

			xfs_bmbt, bb, i, XFS_BMAP_BLOCK_IMAXRECS(	\

	(XFS_BTREE_PTR_ADDR(xfs_bmbt, bb, i, XFS_BMAP_BLOCK_IMAXRECS(	\

				be16_to_cpu((bb)->bb_level), cur)))



/*
@@ -248,11 +224,11 @@ typedef struct xfs_btree_lblock xfs_bmbt_block_t; 
 * we don't have a cursor.

 */

#define XFS_BMAP_BROOT_REC_ADDR(bb,i,sz) \

	(XFS_BTREE_REC_ADDR(sz,xfs_bmbt,bb,i,XFS_BMAP_BROOT_MAXRECS(sz)))

	(XFS_BTREE_REC_ADDR(xfs_bmbt,bb,i))

#define XFS_BMAP_BROOT_KEY_ADDR(bb,i,sz) \

	(XFS_BTREE_KEY_ADDR(sz,xfs_bmbt,bb,i,XFS_BMAP_BROOT_MAXRECS(sz)))

	(XFS_BTREE_KEY_ADDR(xfs_bmbt,bb,i))

#define XFS_BMAP_BROOT_PTR_ADDR(bb,i,sz) \

	(XFS_BTREE_PTR_ADDR(sz,xfs_bmbt,bb,i,XFS_BMAP_BROOT_MAXRECS(sz)))

	(XFS_BTREE_PTR_ADDR(xfs_bmbt,bb,i,XFS_BMAP_BROOT_MAXRECS(sz)))



#define XFS_BMAP_BROOT_NUMRECS(bb)	be16_to_cpu((bb)->bb_numrecs)

#define XFS_BMAP_BROOT_MAXRECS(sz)	XFS_BTREE_BLOCK_MAXRECS(sz,xfs_bmbt,0)

fs/xfs/xfs_btree.h

+3 −3
Original line number Diff line number Diff line
@@ -122,13 +122,13 @@ extern const __uint32_t xfs_magics[]; 
 * Given block size, type prefix, block pointer, and index of requested entry

 * (first entry numbered 1).

 */

#define	XFS_BTREE_REC_ADDR(bsz,t,bb,i,mxr)	\

#define	XFS_BTREE_REC_ADDR(t,bb,i)	\

	((t ## _rec_t *)((char *)(bb) + sizeof(t ## _block_t) + \

	 ((i) - 1) * sizeof(t ## _rec_t)))

#define	XFS_BTREE_KEY_ADDR(bsz,t,bb,i,mxr)	\

#define	XFS_BTREE_KEY_ADDR(t,bb,i)	\

	((t ## _key_t *)((char *)(bb) + sizeof(t ## _block_t) + \

	 ((i) - 1) * sizeof(t ## _key_t)))

#define	XFS_BTREE_PTR_ADDR(bsz,t,bb,i,mxr)	\

#define	XFS_BTREE_PTR_ADDR(t,bb,i,mxr)	\

	((t ## _ptr_t *)((char *)(bb) + sizeof(t ## _block_t) + \

	 (mxr) * sizeof(t ## _key_t) + ((i) - 1) * sizeof(t ## _ptr_t)))