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

xfs: remove the xfs_btree_get_buf[ls] functions 



Remove the xfs_btree_get_bufs and xfs_btree_get_bufl functions, since
they're pretty trivial oneliners.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent ce92464c

fs/xfs/libxfs/xfs_alloc.c

+9 −7
Original line number Diff line number Diff line
@@ -1070,11 +1070,11 @@ xfs_alloc_ag_vextent_small( 
	if (args->datatype & XFS_ALLOC_USERDATA) {

		struct xfs_buf	*bp;



		bp = xfs_btree_get_bufs(args->mp, args->tp, args->agno, fbno);

		if (XFS_IS_CORRUPT(args->mp, !bp)) {

			error = -EFSCORRUPTED;

		error = xfs_trans_get_buf(args->tp, args->mp->m_ddev_targp,

				XFS_AGB_TO_DADDR(args->mp, args->agno, fbno),

				args->mp->m_bsize, 0, &bp);

		if (error)

			goto error;

		}

		xfs_trans_binval(args->tp, bp);

	}

	*fbnop = args->agbno = fbno;
@@ -2347,9 +2347,11 @@ xfs_free_agfl_block( 
	if (error)

		return error;



	bp = xfs_btree_get_bufs(tp->t_mountp, tp, agno, agbno);

	if (XFS_IS_CORRUPT(tp->t_mountp, !bp))

		return -EFSCORRUPTED;

	error = xfs_trans_get_buf(tp, tp->t_mountp->m_ddev_targp,

			XFS_AGB_TO_DADDR(tp->t_mountp, agno, agbno),

			tp->t_mountp->m_bsize, 0, &bp);

	if (error)

		return error;

	xfs_trans_binval(tp, bp);



	return 0;

fs/xfs/libxfs/xfs_bmap.c

+9 −5
Original line number Diff line number Diff line
@@ -730,11 +730,11 @@ xfs_bmap_extents_to_btree( 
	cur->bc_private.b.allocated++;

	ip->i_d.di_nblocks++;

	xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, 1L);

	abp = xfs_btree_get_bufl(mp, tp, args.fsbno);

	if (XFS_IS_CORRUPT(mp, !abp)) {

		error = -EFSCORRUPTED;

	error = xfs_trans_get_buf(tp, mp->m_ddev_targp,

			XFS_FSB_TO_DADDR(mp, args.fsbno),

			mp->m_bsize, 0, &abp);

	if (error)

		goto out_unreserve_dquot;

	}



	/*

	 * Fill in the child block.
@@ -878,7 +878,11 @@ xfs_bmap_local_to_extents( 
	ASSERT(args.fsbno != NULLFSBLOCK);

	ASSERT(args.len == 1);

	tp->t_firstblock = args.fsbno;

	bp = xfs_btree_get_bufl(args.mp, tp, args.fsbno);

	error = xfs_trans_get_buf(tp, args.mp->m_ddev_targp,

			XFS_FSB_TO_DADDR(args.mp, args.fsbno),

			args.mp->m_bsize, 0, &bp);

	if (error)

		goto done;



	/*

	 * Initialize the block, copy the data and log the remote buffer.

fs/xfs/libxfs/xfs_btree.c

+0 −46
Original line number Diff line number Diff line
@@ -678,52 +678,6 @@ xfs_btree_get_block( 
	return XFS_BUF_TO_BLOCK(*bpp);

}



/*

 * Get a buffer for the block, return it with no data read.

 * Long-form addressing.

 */

xfs_buf_t *				/* buffer for fsbno */

xfs_btree_get_bufl(

	xfs_mount_t	*mp,		/* file system mount point */

	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_fsblock_t	fsbno)		/* file system block number */

{

	struct xfs_buf		*bp;

	xfs_daddr_t		d;		/* real disk block address */

	int			error;



	ASSERT(fsbno != NULLFSBLOCK);

	d = XFS_FSB_TO_DADDR(mp, fsbno);

	error = xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, 0, &bp);

	if (error)

		return NULL;

	return bp;

}



/*

 * Get a buffer for the block, return it with no data read.

 * Short-form addressing.

 */

xfs_buf_t *				/* buffer for agno/agbno */

xfs_btree_get_bufs(

	xfs_mount_t	*mp,		/* file system mount point */

	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_agnumber_t	agno,		/* allocation group number */

	xfs_agblock_t	agbno)		/* allocation group block number */

{

	struct xfs_buf		*bp;

	xfs_daddr_t		d;		/* real disk block address */

	int			error;



	ASSERT(agno != NULLAGNUMBER);

	ASSERT(agbno != NULLAGBLOCK);

	d = XFS_AGB_TO_DADDR(mp, agno, agbno);

	error = xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, 0, &bp);

	if (error)

		return NULL;

	return bp;

}



/*

 * Change the cursor to point to the first record at the given level.

 * Other levels are unaffected.

fs/xfs/libxfs/xfs_btree.h

+0 −21
Original line number Diff line number Diff line
@@ -296,27 +296,6 @@ xfs_btree_dup_cursor( 
	xfs_btree_cur_t		*cur,	/* input cursor */

	xfs_btree_cur_t		**ncur);/* output cursor */



/*

 * Get a buffer for the block, return it with no data read.

 * Long-form addressing.

 */

struct xfs_buf *				/* buffer for fsbno */

xfs_btree_get_bufl(

	struct xfs_mount	*mp,	/* file system mount point */

	struct xfs_trans	*tp,	/* transaction pointer */

	xfs_fsblock_t		fsbno);	/* file system block number */



/*

 * Get a buffer for the block, return it with no data read.

 * Short-form addressing.

 */

struct xfs_buf *				/* buffer for agno/agbno */

xfs_btree_get_bufs(

	struct xfs_mount	*mp,	/* file system mount point */

	struct xfs_trans	*tp,	/* transaction pointer */

	xfs_agnumber_t		agno,	/* allocation group number */

	xfs_agblock_t		agbno);	/* allocation group block number */



/*

 * Compute first and last byte offsets for the fields given.

 * Interprets the offsets table, which contains struct field offsets.