Commit 45d06621 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: pass perags through to the busy extent code 



All of the callers of the busy extent API either have perag
references available to use so we can pass a perag to the busy
extent functions rather than having them have to do unnecessary
lookups.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 7f8d3b3c

fs/xfs/libxfs/xfs_alloc.c

+19 −18
Original line number Diff line number Diff line
@@ -1063,7 +1063,7 @@ xfs_alloc_ag_vextent_small( 
	if (fbno == NULLAGBLOCK)

		goto out;



	xfs_extent_busy_reuse(args->mp, args->agno, fbno, 1,

	xfs_extent_busy_reuse(args->mp, args->pag, fbno, 1,

			      (args->datatype & XFS_ALLOC_NOBUSY));



	if (args->datatype & XFS_ALLOC_USERDATA) {
@@ -1178,7 +1178,7 @@ xfs_alloc_ag_vextent( 
		if (error)

			return error;



		ASSERT(!xfs_extent_busy_search(args->mp, args->agno,

		ASSERT(!xfs_extent_busy_search(args->mp, args->pag,

					      args->agbno, args->len));

	}
@@ -3292,7 +3292,7 @@ xfs_alloc_vextent( 
int

xfs_free_extent_fix_freelist(

	struct xfs_trans	*tp,

	xfs_agnumber_t		agno,

	struct xfs_perag	*pag,

	struct xfs_buf		**agbp)

{

	struct xfs_alloc_arg	args;
@@ -3301,7 +3301,8 @@ xfs_free_extent_fix_freelist( 
	memset(&args, 0, sizeof(struct xfs_alloc_arg));

	args.tp = tp;

	args.mp = tp->t_mountp;

	args.agno = agno;

	args.agno = pag->pag_agno;

	args.pag = pag;



	/*

	 * validate that the block number is legal - the enables us to detect
@@ -3310,17 +3311,12 @@ xfs_free_extent_fix_freelist( 
	if (args.agno >= args.mp->m_sb.sb_agcount)

		return -EFSCORRUPTED;



	args.pag = xfs_perag_get(args.mp, args.agno);

	ASSERT(args.pag);



	error = xfs_alloc_fix_freelist(&args, XFS_ALLOC_FLAG_FREEING);

	if (error)

		goto out;

		return error;



	*agbp = args.agbp;

out:

	xfs_perag_put(args.pag);

	return error;

	return 0;

}



/*
@@ -3344,6 +3340,7 @@ __xfs_free_extent( 
	struct xfs_agf			*agf;

	int				error;

	unsigned int			busy_flags = 0;

	struct xfs_perag		*pag;



	ASSERT(len != 0);

	ASSERT(type != XFS_AG_RESV_AGFL);
@@ -3352,33 +3349,37 @@ __xfs_free_extent( 
			XFS_ERRTAG_FREE_EXTENT))

		return -EIO;



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

	pag = xfs_perag_get(mp, agno);

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

	if (error)

		return error;

		goto err;

	agf = agbp->b_addr;



	if (XFS_IS_CORRUPT(mp, agbno >= mp->m_sb.sb_agblocks)) {

		error = -EFSCORRUPTED;

		goto err;

		goto err_release;

	}



	/* validate the extent size is legal now we have the agf locked */

	if (XFS_IS_CORRUPT(mp, agbno + len > be32_to_cpu(agf->agf_length))) {

		error = -EFSCORRUPTED;

		goto err;

		goto err_release;

	}



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

	if (error)

		goto err;

		goto err_release;



	if (skip_discard)

		busy_flags |= XFS_EXTENT_BUSY_SKIP_DISCARD;

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

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

	xfs_perag_put(pag);

	return 0;



err:

err_release:

	xfs_trans_brelse(tp, agbp);

err:

	xfs_perag_put(pag);

	return error;

}

fs/xfs/libxfs/xfs_alloc.h

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ int xfs_alloc_read_agfl(struct xfs_mount *mp, struct xfs_trans *tp, 
int xfs_free_agfl_block(struct xfs_trans *, xfs_agnumber_t, xfs_agblock_t,

			struct xfs_buf *, struct xfs_owner_info *);

int xfs_alloc_fix_freelist(struct xfs_alloc_arg *args, int flags);

int xfs_free_extent_fix_freelist(struct xfs_trans *tp, xfs_agnumber_t agno,

int xfs_free_extent_fix_freelist(struct xfs_trans *tp, struct xfs_perag *pag,

		struct xfs_buf **agbp);



xfs_extlen_t xfs_prealloc_blocks(struct xfs_mount *mp);

fs/xfs/libxfs/xfs_alloc_btree.c

+2 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ xfs_allocbt_alloc_block( 
	}



	atomic64_inc(&cur->bc_mp->m_allocbt_blks);

	xfs_extent_busy_reuse(cur->bc_mp, cur->bc_ag.agno, bno, 1, false);

	xfs_extent_busy_reuse(cur->bc_mp, cur->bc_ag.agbp->b_pag, bno, 1, false);



	new->s = cpu_to_be32(bno);
@@ -86,7 +86,6 @@ xfs_allocbt_free_block( 
	struct xfs_buf		*bp)

{

	struct xfs_buf		*agbp = cur->bc_ag.agbp;

	struct xfs_agf		*agf = agbp->b_addr;

	xfs_agblock_t		bno;

	int			error;
@@ -96,7 +95,7 @@ xfs_allocbt_free_block( 
		return error;



	atomic64_dec(&cur->bc_mp->m_allocbt_blks);

	xfs_extent_busy_insert(cur->bc_tp, be32_to_cpu(agf->agf_seqno), bno, 1,

	xfs_extent_busy_insert(cur->bc_tp, agbp->b_pag, bno, 1,

			      XFS_EXTENT_BUSY_SKIP_DISCARD);

	return 0;

}

fs/xfs/libxfs/xfs_rmap.c

+19 −13
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "xfs_trans_resv.h"

#include "xfs_bit.h"

#include "xfs_mount.h"

#include "xfs_sb.h"

#include "xfs_defer.h"

#include "xfs_btree.h"

#include "xfs_trans.h"
@@ -2363,31 +2364,32 @@ xfs_rmap_finish_one( 
	struct xfs_btree_cur		**pcur)

{

	struct xfs_mount		*mp = tp->t_mountp;

	struct xfs_perag		*pag;

	struct xfs_btree_cur		*rcur;

	struct xfs_buf			*agbp = NULL;

	int				error = 0;

	xfs_agnumber_t			agno;

	struct xfs_owner_info		oinfo;

	xfs_agblock_t			bno;

	bool				unwritten;



	agno = XFS_FSB_TO_AGNO(mp, startblock);

	ASSERT(agno != NULLAGNUMBER);

	pag = xfs_perag_get(mp, XFS_FSB_TO_AGNO(mp, startblock));

	bno = XFS_FSB_TO_AGBNO(mp, startblock);



	trace_xfs_rmap_deferred(mp, agno, type, bno, owner, whichfork,

	trace_xfs_rmap_deferred(mp, pag->pag_agno, type, bno, owner, whichfork,

			startoff, blockcount, state);



	if (XFS_TEST_ERROR(false, mp,

			XFS_ERRTAG_RMAP_FINISH_ONE))

		return -EIO;

	if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_RMAP_FINISH_ONE)) {

		error = -EIO;

		goto out_drop;

	}





	/*

	 * If we haven't gotten a cursor or the cursor AG doesn't match

	 * the startblock, get one now.

	 */

	rcur = *pcur;

	if (rcur != NULL && rcur->bc_ag.agno != agno) {

	if (rcur != NULL && rcur->bc_ag.agno != pag->pag_agno) {

		xfs_rmap_finish_one_cleanup(tp, rcur, 0);

		rcur = NULL;

		*pcur = NULL;
@@ -2398,13 +2400,15 @@ xfs_rmap_finish_one( 
		 * rmapbt, because a shape change could cause us to

		 * allocate blocks.

		 */

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

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

		if (error)

			return error;

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

			return -EFSCORRUPTED;

			goto out_drop;

		if (XFS_IS_CORRUPT(tp->t_mountp, !agbp)) {

			error = -EFSCORRUPTED;

			goto out_drop;

		}



		rcur = xfs_rmapbt_init_cursor(mp, tp, agbp, agno);

		rcur = xfs_rmapbt_init_cursor(mp, tp, agbp, pag->pag_agno);

	}

	*pcur = rcur;
@@ -2442,6 +2446,8 @@ xfs_rmap_finish_one( 
		ASSERT(0);

		error = -EFSCORRUPTED;

	}

out_drop:

	xfs_perag_put(pag);

	return error;

}

fs/xfs/libxfs/xfs_rmap_btree.c

+3 −4
Original line number Diff line number Diff line
@@ -100,8 +100,7 @@ xfs_rmapbt_alloc_block( 
		return 0;

	}



	xfs_extent_busy_reuse(cur->bc_mp, cur->bc_ag.agno, bno, 1,

			false);

	xfs_extent_busy_reuse(cur->bc_mp, agbp->b_pag, bno, 1, false);



	new->s = cpu_to_be32(bno);

	be32_add_cpu(&agf->agf_rmap_blocks, 1);
@@ -133,10 +132,10 @@ xfs_rmapbt_free_block( 
	if (error)

		return error;



	xfs_extent_busy_insert(cur->bc_tp, be32_to_cpu(agf->agf_seqno), bno, 1,

	pag = cur->bc_ag.agbp->b_pag;

	xfs_extent_busy_insert(cur->bc_tp, pag, bno, 1,

			      XFS_EXTENT_BUSY_SKIP_DISCARD);



	pag = cur->bc_ag.agbp->b_pag;

	xfs_ag_resv_free_extent(pag, XFS_AG_RESV_RMAPBT, NULL, 1);

	return 0;

}