Commit 61021deb authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: pass perag to xfs_read_agi 



We have the perag in most palces we call xfs_read_agi, so pass the
perag instead of a mount/agno pair.

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 08d3e84f

fs/xfs/libxfs/xfs_ialloc.c

+10 −11
Original line number Diff line number Diff line
@@ -2571,25 +2571,24 @@ const struct xfs_buf_ops xfs_agi_buf_ops = { 
 */

int

xfs_read_agi(

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

	struct xfs_trans	*tp,	/* transaction pointer */

	xfs_agnumber_t		agno,	/* allocation group number */

	struct xfs_buf		**bpp)	/* allocation group hdr buf */

	struct xfs_perag	*pag,

	struct xfs_trans	*tp,

	struct xfs_buf		**agibpp)

{

	struct xfs_mount	*mp = pag->pag_mount;

	int			error;



	trace_xfs_read_agi(mp, agno);

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



	ASSERT(agno != NULLAGNUMBER);

	error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp,

			XFS_AG_DADDR(mp, agno, XFS_AGI_DADDR(mp)),

			XFS_FSS_TO_BB(mp, 1), 0, bpp, &xfs_agi_buf_ops);

			XFS_AG_DADDR(mp, pag->pag_agno, XFS_AGI_DADDR(mp)),

			XFS_FSS_TO_BB(mp, 1), 0, agibpp, &xfs_agi_buf_ops);

	if (error)

		return error;

	if (tp)

		xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_AGI_BUF);

		xfs_trans_buf_set_type(tp, *agibpp, XFS_BLFT_AGI_BUF);



	xfs_buf_set_ref(*bpp, XFS_AGI_REF);

	xfs_buf_set_ref(*agibpp, XFS_AGI_REF);

	return 0;

}
@@ -2609,7 +2608,7 @@ xfs_ialloc_read_agi( 


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



	error = xfs_read_agi(pag->pag_mount, tp, pag->pag_agno, &agibp);

	error = xfs_read_agi(pag, tp, &agibp);

	if (error)

		return error;

fs/xfs/libxfs/xfs_ialloc.h

+3 −7
Original line number Diff line number Diff line
@@ -62,11 +62,9 @@ xfs_ialloc_log_agi( 
	struct xfs_buf	*bp,		/* allocation group header buffer */

	uint32_t	fields);	/* bitmask of fields to log */



/*

 * Read in the allocation group header (inode allocation section)

 */

int					/* error */

xfs_ialloc_read_agi(struct xfs_perag *pag, struct xfs_trans *tp,

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

		struct xfs_buf **agibpp);

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

		struct xfs_buf **agibpp);



/*
@@ -89,8 +87,6 @@ int xfs_ialloc_inode_init(struct xfs_mount *mp, struct xfs_trans *tp, 
			  xfs_agnumber_t agno, xfs_agblock_t agbno,

			  xfs_agblock_t length, unsigned int gen);



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

		xfs_agnumber_t agno, struct xfs_buf **bpp);



union xfs_btree_rec;

void xfs_inobt_btrec_to_irec(struct xfs_mount *mp,

fs/xfs/xfs_inode.c

+8 −6
Original line number Diff line number Diff line
@@ -2143,7 +2143,7 @@ xfs_iunlink( 
	pag = xfs_perag_get(mp, XFS_INO_TO_AGNO(mp, ip->i_ino));



	/* Get the agi buffer first.  It ensures lock ordering on the list. */

	error = xfs_read_agi(mp, tp, pag->pag_agno, &agibp);

	error = xfs_read_agi(pag, tp, &agibp);

	if (error)

		goto out;

	agi = agibp->b_addr;
@@ -2328,7 +2328,7 @@ xfs_iunlink_remove( 
	trace_xfs_iunlink_remove(ip);



	/* Get the agi buffer first.  It ensures lock ordering on the list. */

	error = xfs_read_agi(mp, tp, pag->pag_agno, &agibp);

	error = xfs_read_agi(pag, tp, &agibp);

	if (error)

		return error;

	agi = agibp->b_addr;
@@ -3229,11 +3229,13 @@ xfs_rename( 
		if (inodes[i] == wip ||

		    (inodes[i] == target_ip &&

		     (VFS_I(target_ip)->i_nlink == 1 || src_is_directory))) {

			struct xfs_perag	*pag;

			struct xfs_buf		*bp;

			xfs_agnumber_t	agno;



			agno = XFS_INO_TO_AGNO(mp, inodes[i]->i_ino);

			error = xfs_read_agi(mp, tp, agno, &bp);

			pag = xfs_perag_get(mp,

					XFS_INO_TO_AGNO(mp, inodes[i]->i_ino));

			error = xfs_read_agi(pag, tp, &bp);

			xfs_perag_put(pag);

			if (error)

				goto out_trans_cancel;

		}

fs/xfs/xfs_log_recover.c

+19 −19
Original line number Diff line number Diff line
@@ -2629,12 +2629,12 @@ xlog_recover_cancel_intents( 
 */

STATIC void

xlog_recover_clear_agi_bucket(

	xfs_mount_t	*mp,

	xfs_agnumber_t	agno,

	struct xfs_perag	*pag,

	int			bucket)

{

	xfs_trans_t	*tp;

	xfs_agi_t	*agi;

	struct xfs_mount	*mp = pag->pag_mount;

	struct xfs_trans	*tp;

	struct xfs_agi		*agi;

	struct xfs_buf		*agibp;

	int			offset;

	int			error;
@@ -2643,7 +2643,7 @@ xlog_recover_clear_agi_bucket( 
	if (error)

		goto out_error;



	error = xfs_read_agi(mp, tp, agno, &agibp);

	error = xfs_read_agi(pag, tp, &agibp);

	if (error)

		goto out_abort;
@@ -2662,14 +2662,14 @@ xlog_recover_clear_agi_bucket( 
out_abort:

	xfs_trans_cancel(tp);

out_error:

	xfs_warn(mp, "%s: failed to clear agi %d. Continuing.", __func__, agno);

	xfs_warn(mp, "%s: failed to clear agi %d. Continuing.", __func__,

			pag->pag_agno);

	return;

}



STATIC xfs_agino_t

xlog_recover_process_one_iunlink(

	struct xfs_mount		*mp,

	xfs_agnumber_t			agno,

	struct xfs_perag		*pag,

	xfs_agino_t			agino,

	int				bucket)

{
@@ -2679,15 +2679,15 @@ xlog_recover_process_one_iunlink( 
	xfs_ino_t			ino;

	int				error;



	ino = XFS_AGINO_TO_INO(mp, agno, agino);

	error = xfs_iget(mp, NULL, ino, 0, 0, &ip);

	ino = XFS_AGINO_TO_INO(pag->pag_mount, pag->pag_agno, agino);

	error = xfs_iget(pag->pag_mount, NULL, ino, 0, 0, &ip);

	if (error)

		goto fail;



	/*

	 * Get the on disk inode to find the next inode in the bucket.

	 */

	error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &ibp);

	error = xfs_imap_to_bp(pag->pag_mount, NULL, &ip->i_imap, &ibp);

	if (error)

		goto fail_iput;

	dip = xfs_buf_offset(ibp, ip->i_imap.im_boffset);
@@ -2714,7 +2714,7 @@ xlog_recover_process_one_iunlink( 
	 * Call xlog_recover_clear_agi_bucket() to perform a transaction to

	 * clear the inode pointer in the bucket.

	 */

	xlog_recover_clear_agi_bucket(mp, agno, bucket);

	xlog_recover_clear_agi_bucket(pag, bucket);

	return NULLAGINO;

}
@@ -2755,7 +2755,7 @@ xlog_recover_process_iunlinks( 
	int			error;



	for_each_perag(mp, agno, pag) {

		error = xfs_read_agi(mp, NULL, pag->pag_agno, &agibp);

		error = xfs_read_agi(pag, NULL, &agibp);

		if (error) {

			/*

			 * AGI is b0rked. Don't process it.
@@ -2780,8 +2780,8 @@ xlog_recover_process_iunlinks( 
		for (bucket = 0; bucket < XFS_AGI_UNLINKED_BUCKETS; bucket++) {

			agino = be32_to_cpu(agi->agi_unlinked[bucket]);

			while (agino != NULLAGINO) {

				agino = xlog_recover_process_one_iunlink(mp,

						pag->pag_agno, agino, bucket);

				agino = xlog_recover_process_one_iunlink(pag,

						agino, bucket);

				cond_resched();

			}

		}