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

Commit 152d93b7 authored by Eric Sandeen's avatar Eric Sandeen Committed by Dave Chinner
Browse files

xfs: remove unused mp arg from xfs_bmdr_maxrecs() 



Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 6d0081a3

fs/xfs/xfs_bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ xfs_bmap_compute_maxlevels( 
		maxleafents = MAXAEXTNUM;

		sz = XFS_BMDR_SPACE_CALC(MINABTPTRS);

	}

	maxrootrecs = xfs_bmdr_maxrecs(mp, sz, 0);

	maxrootrecs = xfs_bmdr_maxrecs(sz, 0);

	minleafrecs = mp->m_bmap_dmnr[0];

	minnoderecs = mp->m_bmap_dmnr[1];

	maxblocks = (maxleafents + minleafrecs - 1) / minleafrecs;

fs/xfs/xfs_bmap_btree.c

+3 −5
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ xfs_bmdr_to_bmbt( 
	rblock->bb_level = dblock->bb_level;

	ASSERT(be16_to_cpu(rblock->bb_level) > 0);

	rblock->bb_numrecs = dblock->bb_numrecs;

	dmxr = xfs_bmdr_maxrecs(mp, dblocklen, 0);

	dmxr = xfs_bmdr_maxrecs(dblocklen, 0);

	fkp = XFS_BMDR_KEY_ADDR(dblock, 1);

	tkp = XFS_BMBT_KEY_ADDR(mp, rblock, 1);

	fpp = XFS_BMDR_PTR_ADDR(dblock, 1, dmxr);
@@ -443,7 +443,7 @@ xfs_bmbt_to_bmdr( 
	ASSERT(rblock->bb_level != 0);

	dblock->bb_level = rblock->bb_level;

	dblock->bb_numrecs = rblock->bb_numrecs;

	dmxr = xfs_bmdr_maxrecs(mp, dblocklen, 0);

	dmxr = xfs_bmdr_maxrecs(dblocklen, 0);

	fkp = XFS_BMBT_KEY_ADDR(mp, rblock, 1);

	tkp = XFS_BMDR_KEY_ADDR(dblock, 1);

	fpp = XFS_BMAP_BROOT_PTR_ADDR(mp, rblock, 1, rblocklen);
@@ -672,8 +672,7 @@ xfs_bmbt_get_dmaxrecs( 
{

	if (level != cur->bc_nlevels - 1)

		return cur->bc_mp->m_bmap_dmxr[level != 0];

	return xfs_bmdr_maxrecs(cur->bc_mp, cur->bc_private.b.forksize,

				level == 0);

	return xfs_bmdr_maxrecs(cur->bc_private.b.forksize, level == 0);

}



STATIC void
@@ -914,7 +913,6 @@ xfs_bmbt_maxrecs( 
 */

int

xfs_bmdr_maxrecs(

	struct xfs_mount	*mp,

	int			blocklen,

	int			leaf)

{

fs/xfs/xfs_bmap_btree.h

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ extern void xfs_bmbt_to_bmdr(struct xfs_mount *, struct xfs_btree_block *, int, 
			xfs_bmdr_block_t *, int);



extern int xfs_bmbt_get_maxrecs(struct xfs_btree_cur *, int level);

extern int xfs_bmdr_maxrecs(struct xfs_mount *, int blocklen, int leaf);

extern int xfs_bmdr_maxrecs(int blocklen, int leaf);

extern int xfs_bmbt_maxrecs(struct xfs_mount *, int blocklen, int leaf);



extern int xfs_bmbt_change_owner(struct xfs_trans *tp, struct xfs_inode *ip,