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

xfs: pass per-ag references to xfs_free_extent 



Pass a reference to the per-AG structure to xfs_free_extent.  Most
callers already have one, so we can eliminate unnecessary lookups.  The
one exception to this is the EFI code, which the next patch will fix.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 774a99b4

fs/xfs/libxfs/xfs_ag.c

+2 −4
Original line number Diff line number Diff line
@@ -1043,10 +1043,8 @@ xfs_ag_extend_space( 
	if (error)

		return error;



	error = xfs_free_extent(tp, XFS_AGB_TO_FSB(pag->pag_mount, pag->pag_agno,

					be32_to_cpu(agf->agf_length) - len),

				len, &XFS_RMAP_OINFO_SKIP_UPDATE,

				XFS_AG_RESV_NONE);

	error = xfs_free_extent(tp, pag, be32_to_cpu(agf->agf_length) - len,

			len, &XFS_RMAP_OINFO_SKIP_UPDATE, XFS_AG_RESV_NONE);

	if (error)

		return error;

fs/xfs/libxfs/xfs_alloc.c

+5 −10
Original line number Diff line number Diff line
@@ -3596,7 +3596,8 @@ xfs_free_extent_fix_freelist( 
int

__xfs_free_extent(

	struct xfs_trans		*tp,

	xfs_fsblock_t			bno,

	struct xfs_perag		*pag,

	xfs_agblock_t			agbno,

	xfs_extlen_t			len,

	const struct xfs_owner_info	*oinfo,

	enum xfs_ag_resv_type		type,
@@ -3604,12 +3605,9 @@ __xfs_free_extent( 
{

	struct xfs_mount		*mp = tp->t_mountp;

	struct xfs_buf			*agbp;

	xfs_agnumber_t			agno = XFS_FSB_TO_AGNO(mp, bno);

	xfs_agblock_t			agbno = XFS_FSB_TO_AGBNO(mp, bno);

	struct xfs_agf			*agf;

	int				error;

	unsigned int			busy_flags = 0;

	struct xfs_perag		*pag;



	ASSERT(len != 0);

	ASSERT(type != XFS_AG_RESV_AGFL);
@@ -3618,10 +3616,9 @@ __xfs_free_extent( 
			XFS_ERRTAG_FREE_EXTENT))

		return -EIO;



	pag = xfs_perag_get(mp, agno);

	error = xfs_free_extent_fix_freelist(tp, pag, &agbp);

	if (error)

		goto err;

		return error;

	agf = agbp->b_addr;



	if (XFS_IS_CORRUPT(mp, agbno >= mp->m_sb.sb_agblocks)) {
@@ -3635,20 +3632,18 @@ __xfs_free_extent( 
		goto err_release;

	}



	error = xfs_free_ag_extent(tp, agbp, agno, agbno, len, oinfo, type);

	error = xfs_free_ag_extent(tp, agbp, pag->pag_agno, agbno, len, oinfo,

			type);

	if (error)

		goto err_release;



	if (skip_discard)

		busy_flags |= XFS_EXTENT_BUSY_SKIP_DISCARD;

	xfs_extent_busy_insert(tp, pag, agbno, len, busy_flags);

	xfs_perag_put(pag);

	return 0;



err_release:

	xfs_trans_brelse(tp, agbp);

err:

	xfs_perag_put(pag);

	return error;

}

fs/xfs/libxfs/xfs_alloc.h

+5 −3
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ int xfs_alloc_vextent_first_ag(struct xfs_alloc_arg *args, 
int				/* error */

__xfs_free_extent(

	struct xfs_trans	*tp,	/* transaction pointer */

	xfs_fsblock_t		bno,	/* starting block number of extent */

	struct xfs_perag	*pag,

	xfs_agblock_t		agbno,

	xfs_extlen_t		len,	/* length of extent */

	const struct xfs_owner_info	*oinfo,	/* extent owner */

	enum xfs_ag_resv_type	type,	/* block reservation type */
@@ -150,12 +151,13 @@ __xfs_free_extent( 
static inline int

xfs_free_extent(

	struct xfs_trans	*tp,

	xfs_fsblock_t		bno,

	struct xfs_perag	*pag,

	xfs_agblock_t		agbno,

	xfs_extlen_t		len,

	const struct xfs_owner_info	*oinfo,

	enum xfs_ag_resv_type	type)

{

	return __xfs_free_extent(tp, bno, len, oinfo, type, false);

	return __xfs_free_extent(tp, pag, agbno, len, oinfo, type, false);

}



int				/* error */

fs/xfs/libxfs/xfs_ialloc_btree.c

+5 −2
Original line number Diff line number Diff line
@@ -156,9 +156,12 @@ __xfs_inobt_free_block( 
	struct xfs_buf		*bp,

	enum xfs_ag_resv_type	resv)

{

	xfs_fsblock_t		fsbno;



	xfs_inobt_mod_blockcount(cur, -1);

	return xfs_free_extent(cur->bc_tp,

			XFS_DADDR_TO_FSB(cur->bc_mp, xfs_buf_daddr(bp)), 1,

	fsbno = XFS_DADDR_TO_FSB(cur->bc_mp, xfs_buf_daddr(bp));

	return xfs_free_extent(cur->bc_tp, cur->bc_ag.pag,

			XFS_FSB_TO_AGBNO(cur->bc_mp, fsbno), 1,

			&XFS_RMAP_OINFO_INOBT, resv);

}

fs/xfs/libxfs/xfs_refcount_btree.c

+3 −2
Original line number Diff line number Diff line
@@ -112,8 +112,9 @@ xfs_refcountbt_free_block( 
			XFS_FSB_TO_AGBNO(cur->bc_mp, fsbno), 1);

	be32_add_cpu(&agf->agf_refcount_blocks, -1);

	xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_REFCOUNT_BLOCKS);

	error = xfs_free_extent(cur->bc_tp, fsbno, 1, &XFS_RMAP_OINFO_REFC,

			XFS_AG_RESV_METADATA);

	error = xfs_free_extent(cur->bc_tp, cur->bc_ag.pag,

			XFS_FSB_TO_AGBNO(cur->bc_mp, fsbno), 1,

			&XFS_RMAP_OINFO_REFC, XFS_AG_RESV_METADATA);

	if (error)

		return error;