remove unused arguments from the XFS_BTREE_*_ADDR functions
PATCH 1/1 remove unused arguments from the XFS_BTREE_*_ADDR functions
Unused arguments to macros... I don't honestly remember how I stumbled across these...
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....
I suppose this one may take some extra scrutiny to review, but it's a bunch of dead & therefore confusing code, near as I can tell.
Thanks,
-Eric
xfs_alloc_btree.h | 10 +++------- xfs_bmap.c | 35 ++++++++++++----------------------- xfs_bmap_btree.c | 8 ++++---- xfs_bmap_btree.h | 46 +++++++++++----------------------------------- xfs_btree.h | 6 +++--- xfs_fsops.c | 6 ++---- xfs_ialloc_btree.h | 10 ++++------ xfsidbg.c | 19 +++++++++---------- 8 files changed, 48 insertions(+), 92 deletions(-)
xfs_alloc_btree.h +3 -7
@@ -58,7 +58,6 @@ typedef struct xfs_btree_sblock xfs_allo/* * 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_allo* 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.
xfs_bmap.c +12 -23
@@ -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 ;
xfs_bmap_btree.c +4 -4
@@ -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);
xfs_bmap_btree.h +11 -35
78 lines not on this page · raw message
xfs_btree.h +3 -3
@@ -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)))
xfs_fsops.c +2 -4
@@ -250,8 +250,7 @@ xfs_growfs_data_private( block->bb_numrecs =cpu_to_be16 (1 ); block->bb_leftsib =cpu_to_be32 (NULLAGBLOCK ); block->bb_rightsib =cpu_to_be32 (NULLAGBLOCK ); - arec =XFS_BTREE_REC_ADDR (mp->m_sb.sb_blocksize, xfs_alloc, - block,1 , mp->m_alloc_mxr[0 ]); + arec =XFS_BTREE_REC_ADDR (xfs_alloc, block,1 ); arec->ar_startblock =cpu_to_be32 (XFS_PREALLOC_BLOCKS (mp)); arec->ar_blockcount =cpu_to_be32 ( agsize -be32_to_cpu (arec->ar_startblock));
@@ -272,8 +271,7 @@ xfs_growfs_data_private( block->bb_numrecs =cpu_to_be16 (1 ); block->bb_leftsib =cpu_to_be32 (NULLAGBLOCK ); block->bb_rightsib =cpu_to_be32 (NULLAGBLOCK ); - arec =XFS_BTREE_REC_ADDR (mp->m_sb.sb_blocksize, xfs_alloc, - block,1 , mp->m_alloc_mxr[0 ]); + arec =XFS_BTREE_REC_ADDR (xfs_alloc, block,1 ); arec->ar_startblock =cpu_to_be32 (XFS_PREALLOC_BLOCKS (mp)); arec->ar_blockcount =cpu_to_be32 ( agsize -be32_to_cpu (arec->ar_startblock));
xfs_ialloc_btree.h +4 -6
@@ -89,7 +89,6 @@ typedef struct xfs_btree_sblock xfs_inob/* * Real block structures have a size equal to the disk block size. */ -#define XFS_INOBT_BLOCK_SIZE (lev,cur) (1 << (cur)->bc_blocklog)#define XFS_INOBT_BLOCK_MAXRECS (lev,cur) ((cur)->bc_mp->m_inobt_mxr[lev != 0])#define XFS_INOBT_BLOCK_MINRECS (lev,cur) ((cur)->bc_mp->m_inobt_mnr[lev != 0])#define XFS_INOBT_IS_LAST_REC (cur) \
@@ -110,14 +109,13 @@ typedef struct xfs_btree_sblock xfs_inob* Record, key, and pointer address macros for btree blocks. */ #define XFS_INOBT_REC_ADDR (bb,i,cur) \ - (XFS_BTREE_REC_ADDR(XFS_INOBT_BLOCK_SIZE(0,cur), xfs_inobt, bb, \ - i, XFS_INOBT_BLOCK_MAXRECS(0, cur))) + (XFS_BTREE_REC_ADDR(xfs_inobt, bb, i)) +#define XFS_INOBT_KEY_ADDR (bb,i,cur) \ - (XFS_BTREE_KEY_ADDR(XFS_INOBT_BLOCK_SIZE(1,cur), xfs_inobt, bb, \ - i, XFS_INOBT_BLOCK_MAXRECS(1, cur))) + (XFS_BTREE_KEY_ADDR(xfs_inobt, bb, i))#define XFS_INOBT_PTR_ADDR (bb,i,cur) \ - (XFS_BTREE_PTR_ADDR(XFS_INOBT_BLOCK_SIZE(1,cur), xfs_inobt, bb, \ + (XFS_BTREE_PTR_ADDR(xfs_inobt, bb, \ i, XFS_INOBT_BLOCK_MAXRECS(1, cur)))/*
xfsidbg.c +9 -10
@@ -3227,7 +3227,7 @@ xfs_btalloc(xfs_alloc_block_t *bt, int bfor (i =1 ; i <=be16_to_cpu (bt->bb_numrecs); i++) {xfs_alloc_rec_t *r; - r =XFS_BTREE_REC_ADDR (bsz, xfs_alloc, bt, i,0 ); + r =XFS_BTREE_REC_ADDR (xfs_alloc, bt, i); kdb_printf("rec %d startblock 0x%x blockcount %d\n", i, be32_to_cpu(r->ar_startblock),
@@ -3241,8 +3241,8 @@ xfs_btalloc(xfs_alloc_block_t *bt, int bxfs_alloc_key_t *k;xfs_alloc_ptr_t *p; - k =XFS_BTREE_KEY_ADDR (bsz, xfs_alloc, bt, i, mxr); - p =XFS_BTREE_PTR_ADDR (bsz, xfs_alloc, bt, i, mxr); + k =XFS_BTREE_KEY_ADDR (xfs_alloc, bt, i); + p =XFS_BTREE_PTR_ADDR (xfs_alloc, bt, i, mxr); kdb_printf("key %d startblock 0x%x blockcount %d ptr 0x%x\n", i, be32_to_cpu(k->ar_startblock),
@@ -3271,8 +3271,7 @@ xfs_btbmap(xfs_bmbt_block_t *bt, int bszxfs_bmbt_rec_t *r;xfs_bmbt_irec_t irec; - r = (xfs_bmbt_rec_t *)XFS_BTREE_REC_ADDR (bsz, - xfs_bmbt, bt, i,0 ); + r = (xfs_bmbt_rec_t *)XFS_BTREE_REC_ADDR (xfs_bmbt, bt, i);xfs_bmbt_disk_get_all ((xfs_bmbt_rec_t *)r, &irec); kdb_printf("rec %d startoff %Ld startblock %Lx blockcount %Ld flag %d\n",
@@ -3288,8 +3287,8 @@ xfs_btbmap(xfs_bmbt_block_t *bt, int bszxfs_bmbt_key_t *k;xfs_bmbt_ptr_t *p; - k =XFS_BTREE_KEY_ADDR (bsz, xfs_bmbt, bt, i, mxr); - p =XFS_BTREE_PTR_ADDR (bsz, xfs_bmbt, bt, i, mxr); + k =XFS_BTREE_KEY_ADDR (xfs_bmbt, bt, i); + p =XFS_BTREE_PTR_ADDR (xfs_bmbt, bt, i, mxr);kdb_printf ("key %d startoff %Ld " , i, (unsigned long long )INT_GET (k->br_startoff,ARCH_CONVERT )); kdb_printf("ptr %Lx\n",
@@ -3316,7 +3315,7 @@ xfs_btino(xfs_inobt_block_t *bt, int bszfor (i =1 ; i <=be16_to_cpu (bt->bb_numrecs); i++) {xfs_inobt_rec_t *r; - r =XFS_BTREE_REC_ADDR (bsz, xfs_inobt, bt, i,0 ); + r =XFS_BTREE_REC_ADDR (xfs_inobt, bt, i); kdb_printf("rec %d startino 0x%x freecount %d, free %Lx\n", i, INT_GET(r->ir_startino, ARCH_CONVERT), INT_GET(r->ir_freecount, ARCH_CONVERT),
@@ -3330,8 +3329,8 @@ xfs_btino(xfs_inobt_block_t *bt, int bszxfs_inobt_key_t *k;xfs_inobt_ptr_t *p; - k =XFS_BTREE_KEY_ADDR (bsz, xfs_inobt, bt, i, mxr); - p =XFS_BTREE_PTR_ADDR (bsz, xfs_inobt, bt, i, mxr); + k =XFS_BTREE_KEY_ADDR (xfs_inobt, bt, i); + p =XFS_BTREE_PTR_ADDR (xfs_inobt, bt, i, mxr);kdb_printf ("key %d startino 0x%x ptr 0x%x\n" , i,INT_GET (k->ir_startino,ARCH_CONVERT ),be32_to_cpu (*p));