Commit 08d3e84f authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: pass perag to xfs_alloc_read_agf() 



xfs_alloc_read_agf() initialises the perag if it hasn't been done
yet, so it makes sense to pass it the perag rather than pull a
reference from the buffer. This allows callers to be per-ag centric
rather than passing mount/agno pairs everywhere.

Whilst modifying the xfs_reflink_find_shared() function definition,
declare it static and remove the extern declaration as it is an
internal function only these days.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 76b47e52

fs/xfs/libxfs/xfs_ag.c

+8 −12
Original line number Diff line number Diff line
@@ -120,15 +120,12 @@ xfs_initialize_perag_data( 


	for (index = 0; index < agcount; index++) {

		/*

		 * read the agf, then the agi. This gets us

		 * all the information we need and populates the

		 * per-ag structures for us.

		 * Read the AGF and AGI buffers to populate the per-ag

		 * structures for us.

		 */

		error = xfs_alloc_read_agf(mp, NULL, index, 0, NULL);

		if (error)

			return error;



		pag = xfs_perag_get(mp, index);

		error = xfs_alloc_read_agf(pag, NULL, 0, NULL);

		if (!error)

			error = xfs_ialloc_read_agi(pag, NULL, NULL);

		if (error) {

			xfs_perag_put(pag);
@@ -792,7 +789,7 @@ xfs_ag_shrink_space( 


	agi = agibp->b_addr;



	error = xfs_alloc_read_agf(mp, *tpp, pag->pag_agno, 0, &agfbp);

	error = xfs_alloc_read_agf(pag, *tpp, 0, &agfbp);

	if (error)

		return error;
@@ -910,7 +907,7 @@ xfs_ag_extend_space( 
	/*

	 * Change agf length.

	 */

	error = xfs_alloc_read_agf(pag->pag_mount, tp, pag->pag_agno, 0, &bp);

	error = xfs_alloc_read_agf(pag, tp, 0, &bp);

	if (error)

		return error;
@@ -953,8 +950,7 @@ xfs_ag_get_geometry( 
	error = xfs_ialloc_read_agi(pag, NULL, &agi_bp);

	if (error)

		return error;

	error = xfs_alloc_read_agf(pag->pag_mount, NULL, pag->pag_agno, 0,

			&agf_bp);

	error = xfs_alloc_read_agf(pag, NULL, 0, &agf_bp);

	if (error)

		goto out_agi;

fs/xfs/libxfs/xfs_ag_resv.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ xfs_ag_resv_init( 
	 * address.

	 */

	if (has_resv) {

		error2 = xfs_alloc_read_agf(mp, tp, pag->pag_agno, 0, NULL);

		error2 = xfs_alloc_read_agf(pag, tp, 0, NULL);

		if (error2)

			return error2;

fs/xfs/libxfs/xfs_alloc.c

+14 −17
Original line number Diff line number Diff line
@@ -2609,7 +2609,7 @@ xfs_alloc_fix_freelist( 
	ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES);



	if (!pag->pagf_init) {

		error = xfs_alloc_read_agf(mp, tp, args->agno, flags, &agbp);

		error = xfs_alloc_read_agf(pag, tp, flags, &agbp);

		if (error) {

			/* Couldn't lock the AGF so skip this AG. */

			if (error == -EAGAIN)
@@ -2639,7 +2639,7 @@ xfs_alloc_fix_freelist( 
	 * Can fail if we're not blocking on locks, and it's held.

	 */

	if (!agbp) {

		error = xfs_alloc_read_agf(mp, tp, args->agno, flags, &agbp);

		error = xfs_alloc_read_agf(pag, tp, flags, &agbp);

		if (error) {

			/* Couldn't lock the AGF so skip this AG. */

			if (error == -EAGAIN)
@@ -3080,34 +3080,30 @@ xfs_read_agf( 
 * perag structure if necessary. If the caller provides @agfbpp, then return the

 * locked buffer to the caller, otherwise free it.

 */

int					/* error */

int

xfs_alloc_read_agf(

	struct xfs_mount	*mp,	/* mount point structure */

	struct xfs_trans	*tp,	/* transaction pointer */

	xfs_agnumber_t		agno,	/* allocation group number */

	int			flags,	/* XFS_ALLOC_FLAG_... */

	struct xfs_perag	*pag,

	struct xfs_trans	*tp,

	int			flags,

	struct xfs_buf		**agfbpp)

{

	struct xfs_buf		*agfbp;

	struct xfs_agf		*agf;		/* ag freelist header */

	struct xfs_perag	*pag;		/* per allocation group data */

	struct xfs_agf		*agf;

	int			error;

	int			allocbt_blks;



	trace_xfs_alloc_read_agf(mp, agno);

	trace_xfs_alloc_read_agf(pag->pag_mount, pag->pag_agno);



	/* We don't support trylock when freeing. */

	ASSERT((flags & (XFS_ALLOC_FLAG_FREEING | XFS_ALLOC_FLAG_TRYLOCK)) !=

			(XFS_ALLOC_FLAG_FREEING | XFS_ALLOC_FLAG_TRYLOCK));

	ASSERT(agno != NULLAGNUMBER);

	error = xfs_read_agf(mp, tp, agno,

	error = xfs_read_agf(pag->pag_mount, tp, pag->pag_agno,

			(flags & XFS_ALLOC_FLAG_TRYLOCK) ? XBF_TRYLOCK : 0,

			&agfbp);

	if (error)

		return error;



	agf = agfbp->b_addr;

	pag = agfbp->b_pag;

	if (!pag->pagf_init) {

		pag->pagf_freeblks = be32_to_cpu(agf->agf_freeblks);

		pag->pagf_btreeblks = be32_to_cpu(agf->agf_btreeblks);
@@ -3121,7 +3117,7 @@ xfs_alloc_read_agf( 
			be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAPi]);

		pag->pagf_refcount_level = be32_to_cpu(agf->agf_refcount_level);

		pag->pagf_init = 1;

		pag->pagf_agflreset = xfs_agfl_needs_reset(mp, agf);

		pag->pagf_agflreset = xfs_agfl_needs_reset(pag->pag_mount, agf);



		/*

		 * Update the in-core allocbt counter. Filter out the rmapbt
@@ -3131,13 +3127,14 @@ xfs_alloc_read_agf( 
		 * counter only tracks non-root blocks.

		 */

		allocbt_blks = pag->pagf_btreeblks;

		if (xfs_has_rmapbt(mp))

		if (xfs_has_rmapbt(pag->pag_mount))

			allocbt_blks -= be32_to_cpu(agf->agf_rmap_blocks) - 1;

		if (allocbt_blks > 0)

			atomic64_add(allocbt_blks, &mp->m_allocbt_blks);

			atomic64_add(allocbt_blks,

					&pag->pag_mount->m_allocbt_blks);

	}

#ifdef DEBUG

	else if (!xfs_is_shutdown(mp)) {

	else if (!xfs_is_shutdown(pag->pag_mount)) {

		ASSERT(pag->pagf_freeblks == be32_to_cpu(agf->agf_freeblks));

		ASSERT(pag->pagf_btreeblks == be32_to_cpu(agf->agf_btreeblks));

		ASSERT(pag->pagf_flcount == be32_to_cpu(agf->agf_flcount));

fs/xfs/libxfs/xfs_alloc.h

+2 −11
Original line number Diff line number Diff line
@@ -134,17 +134,6 @@ xfs_alloc_put_freelist( 
	xfs_agblock_t	bno,	/* block being freed */

	int		btreeblk); /* owner was a AGF btree */



/*

 * Read in the allocation group header (free/alloc section).

 */

int					/* error  */

xfs_alloc_read_agf(

	struct xfs_mount *mp,		/* mount point structure */

	struct xfs_trans *tp,		/* transaction pointer */

	xfs_agnumber_t	agno,		/* allocation group number */

	int		flags,		/* XFS_ALLOC_FLAG_... */

	struct xfs_buf	**bpp);		/* buffer for the ag freelist header */



/*

 * Allocate an extent (variable-size).

 */
@@ -198,6 +187,8 @@ xfs_alloc_get_rec( 


int xfs_read_agf(struct xfs_mount *mp, struct xfs_trans *tp,

			xfs_agnumber_t agno, int flags, struct xfs_buf **bpp);

int xfs_alloc_read_agf(struct xfs_perag *pag, struct xfs_trans *tp, int flags,

		struct xfs_buf **agfbpp);

int xfs_alloc_read_agfl(struct xfs_mount *mp, struct xfs_trans *tp,

			xfs_agnumber_t agno, struct xfs_buf **bpp);

int xfs_free_agfl_block(struct xfs_trans *, xfs_agnumber_t, xfs_agblock_t,

fs/xfs/libxfs/xfs_bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -3185,7 +3185,7 @@ xfs_bmap_longest_free_extent( 


	pag = xfs_perag_get(mp, ag);

	if (!pag->pagf_init) {

		error = xfs_alloc_read_agf(mp, tp, ag, XFS_ALLOC_FLAG_TRYLOCK,

		error = xfs_alloc_read_agf(pag, tp, XFS_ALLOC_FLAG_TRYLOCK,

				NULL);

		if (error) {

			/* Couldn't lock the AGF, so skip this AG. */