Commit 56370ea6 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: refactor btree cursor allocation function 



Refactor btree allocation to a common helper.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 69724d92

fs/xfs/libxfs/xfs_alloc_btree.c

+1 −5
Original line number Diff line number Diff line
@@ -477,11 +477,7 @@ xfs_allocbt_init_common( 


	ASSERT(btnum == XFS_BTNUM_BNO || btnum == XFS_BTNUM_CNT);



	cur = kmem_cache_zalloc(xfs_btree_cur_zone, GFP_NOFS | __GFP_NOFAIL);



	cur->bc_tp = tp;

	cur->bc_mp = mp;

	cur->bc_btnum = btnum;

	cur = xfs_btree_alloc_cursor(mp, tp, btnum);

	cur->bc_ag.abt.active = false;



	if (btnum == XFS_BTNUM_CNT) {

fs/xfs/libxfs/xfs_bmap_btree.c

+1 −5
Original line number Diff line number Diff line
@@ -552,12 +552,8 @@ xfs_bmbt_init_cursor( 
	struct xfs_btree_cur	*cur;

	ASSERT(whichfork != XFS_COW_FORK);



	cur = kmem_cache_zalloc(xfs_btree_cur_zone, GFP_NOFS | __GFP_NOFAIL);



	cur->bc_tp = tp;

	cur->bc_mp = mp;

	cur = xfs_btree_alloc_cursor(mp, tp, XFS_BTNUM_BMAP);

	cur->bc_nlevels = be16_to_cpu(ifp->if_broot->bb_level) + 1;

	cur->bc_btnum = XFS_BTNUM_BMAP;

	cur->bc_statoff = XFS_STATS_CALC_INDEX(xs_bmbt_2);



	cur->bc_ops = &xfs_bmbt_ops;

fs/xfs/libxfs/xfs_btree.h

+16 −0
Original line number Diff line number Diff line
@@ -578,4 +578,20 @@ void xfs_btree_copy_keys(struct xfs_btree_cur *cur, 
		union xfs_btree_key *dst_key,

		const union xfs_btree_key *src_key, int numkeys);



static inline struct xfs_btree_cur *

xfs_btree_alloc_cursor(

	struct xfs_mount	*mp,

	struct xfs_trans	*tp,

	xfs_btnum_t		btnum)

{

	struct xfs_btree_cur	*cur;



	cur = kmem_cache_zalloc(xfs_btree_cur_zone, GFP_NOFS | __GFP_NOFAIL);

	cur->bc_tp = tp;

	cur->bc_mp = mp;

	cur->bc_btnum = btnum;



	return cur;

}



#endif	/* __XFS_BTREE_H__ */

fs/xfs/libxfs/xfs_ialloc_btree.c

+1 −4
Original line number Diff line number Diff line
@@ -432,10 +432,7 @@ xfs_inobt_init_common( 
{

	struct xfs_btree_cur	*cur;



	cur = kmem_cache_zalloc(xfs_btree_cur_zone, GFP_NOFS | __GFP_NOFAIL);

	cur->bc_tp = tp;

	cur->bc_mp = mp;

	cur->bc_btnum = btnum;

	cur = xfs_btree_alloc_cursor(mp, tp, btnum);

	if (btnum == XFS_BTNUM_INO) {

		cur->bc_statoff = XFS_STATS_CALC_INDEX(xs_ibt_2);

		cur->bc_ops = &xfs_inobt_ops;

fs/xfs/libxfs/xfs_refcount_btree.c

+1 −4
Original line number Diff line number Diff line
@@ -322,10 +322,7 @@ xfs_refcountbt_init_common( 


	ASSERT(pag->pag_agno < mp->m_sb.sb_agcount);



	cur = kmem_cache_zalloc(xfs_btree_cur_zone, GFP_NOFS | __GFP_NOFAIL);

	cur->bc_tp = tp;

	cur->bc_mp = mp;

	cur->bc_btnum = XFS_BTNUM_REFC;

	cur = xfs_btree_alloc_cursor(mp, tp, XFS_BTNUM_REFC);

	cur->bc_statoff = XFS_STATS_CALC_INDEX(xs_refcbt_2);



	cur->bc_flags |= XFS_BTREE_CRC_BLOCKS;