Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

xfs: pass transaction lock while setting up agresv on cyclic metadata 



Pass a tranaction pointer through to all helpers that calculate the
per-AG block reservation.  Online repair will use this to reinitialize
per-ag reservations while it still holds all the AG headers locked to
the repair transaction.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
parent 1c02d502

fs/xfs/libxfs/xfs_ag_resv.c

+7 −6
Original line number Diff line number Diff line
@@ -248,7 +248,8 @@ __xfs_ag_resv_init( 
/* Create a per-AG block reservation. */

int

xfs_ag_resv_init(

	struct xfs_perag		*pag)

	struct xfs_perag		*pag,

	struct xfs_trans		*tp)

{

	struct xfs_mount		*mp = pag->pag_mount;

	xfs_agnumber_t			agno = pag->pag_agno;
@@ -260,11 +261,11 @@ xfs_ag_resv_init( 
	if (pag->pag_meta_resv.ar_asked == 0) {

		ask = used = 0;



		error = xfs_refcountbt_calc_reserves(mp, agno, &ask, &used);

		error = xfs_refcountbt_calc_reserves(mp, tp, agno, &ask, &used);

		if (error)

			goto out;



		error = xfs_finobt_calc_reserves(mp, agno, &ask, &used);

		error = xfs_finobt_calc_reserves(mp, tp, agno, &ask, &used);

		if (error)

			goto out;
@@ -282,7 +283,7 @@ xfs_ag_resv_init( 


			mp->m_inotbt_nores = true;



			error = xfs_refcountbt_calc_reserves(mp, agno, &ask,

			error = xfs_refcountbt_calc_reserves(mp, tp, agno, &ask,

					&used);

			if (error)

				goto out;
@@ -298,7 +299,7 @@ xfs_ag_resv_init( 
	if (pag->pag_rmapbt_resv.ar_asked == 0) {

		ask = used = 0;



		error = xfs_rmapbt_calc_reserves(mp, agno, &ask, &used);

		error = xfs_rmapbt_calc_reserves(mp, tp, agno, &ask, &used);

		if (error)

			goto out;
@@ -309,7 +310,7 @@ xfs_ag_resv_init( 


#ifdef DEBUG

	/* need to read in the AGF for the ASSERT below to work */

	error = xfs_alloc_pagf_init(pag->pag_mount, NULL, pag->pag_agno, 0);

	error = xfs_alloc_pagf_init(pag->pag_mount, tp, pag->pag_agno, 0);

	if (error)

		return error;

fs/xfs/libxfs/xfs_ag_resv.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#define	__XFS_AG_RESV_H__



int xfs_ag_resv_free(struct xfs_perag *pag);

int xfs_ag_resv_init(struct xfs_perag *pag);

int xfs_ag_resv_init(struct xfs_perag *pag, struct xfs_trans *tp);



bool xfs_ag_resv_critical(struct xfs_perag *pag, enum xfs_ag_resv_type type);

xfs_extlen_t xfs_ag_resv_needed(struct xfs_perag *pag,

fs/xfs/libxfs/xfs_ialloc_btree.c

+6 −4
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ xfs_inobt_max_size( 
static int

xfs_inobt_count_blocks(

	struct xfs_mount	*mp,

	struct xfs_trans	*tp,

	xfs_agnumber_t		agno,

	xfs_btnum_t		btnum,

	xfs_extlen_t		*tree_blocks)
@@ -560,14 +561,14 @@ xfs_inobt_count_blocks( 
	struct xfs_btree_cur	*cur;

	int			error;



	error = xfs_ialloc_read_agi(mp, NULL, agno, &agbp);

	error = xfs_ialloc_read_agi(mp, tp, agno, &agbp);

	if (error)

		return error;



	cur = xfs_inobt_init_cursor(mp, NULL, agbp, agno, btnum);

	cur = xfs_inobt_init_cursor(mp, tp, agbp, agno, btnum);

	error = xfs_btree_count_blocks(cur, tree_blocks);

	xfs_btree_del_cursor(cur, error);

	xfs_buf_relse(agbp);

	xfs_trans_brelse(tp, agbp);



	return error;

}
@@ -578,6 +579,7 @@ xfs_inobt_count_blocks( 
int

xfs_finobt_calc_reserves(

	struct xfs_mount	*mp,

	struct xfs_trans	*tp,

	xfs_agnumber_t		agno,

	xfs_extlen_t		*ask,

	xfs_extlen_t		*used)
@@ -588,7 +590,7 @@ xfs_finobt_calc_reserves( 
	if (!xfs_sb_version_hasfinobt(&mp->m_sb))

		return 0;



	error = xfs_inobt_count_blocks(mp, agno, XFS_BTNUM_FINO, &tree_len);

	error = xfs_inobt_count_blocks(mp, tp, agno, XFS_BTNUM_FINO, &tree_len);

	if (error)

		return error;

fs/xfs/libxfs/xfs_ialloc_btree.h

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ int xfs_inobt_rec_check_count(struct xfs_mount *, 
#define xfs_inobt_rec_check_count(mp, rec)	0

#endif	/* DEBUG */



int xfs_finobt_calc_reserves(struct xfs_mount *mp, xfs_agnumber_t agno,

		xfs_extlen_t *ask, xfs_extlen_t *used);

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

		xfs_agnumber_t agno, xfs_extlen_t *ask, xfs_extlen_t *used);

extern xfs_extlen_t xfs_iallocbt_calc_size(struct xfs_mount *mp,

		unsigned long long len);

fs/xfs/libxfs/xfs_refcount_btree.c

+3 −2
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ xfs_refcountbt_max_size( 
int

xfs_refcountbt_calc_reserves(

	struct xfs_mount	*mp,

	struct xfs_trans	*tp,

	xfs_agnumber_t		agno,

	xfs_extlen_t		*ask,

	xfs_extlen_t		*used)
@@ -418,14 +419,14 @@ xfs_refcountbt_calc_reserves( 
		return 0;





	error = xfs_alloc_read_agf(mp, NULL, agno, 0, &agbp);

	error = xfs_alloc_read_agf(mp, tp, agno, 0, &agbp);

	if (error)

		return error;



	agf = XFS_BUF_TO_AGF(agbp);

	agblocks = be32_to_cpu(agf->agf_length);

	tree_len = be32_to_cpu(agf->agf_refcount_blocks);

	xfs_buf_relse(agbp);

	xfs_trans_brelse(tp, agbp);



	*ask += xfs_refcountbt_max_size(mp, agblocks);

	*used += tree_len;