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

Commit 200237d6 authored by Eric Sandeen's avatar Eric Sandeen Committed by Dave Chinner
Browse files

xfs: Move AGI buffer type setting to xfs_read_agi 



We've missed properly setting the buffer type for
an AGI transaction in 3 spots now, so just move it
into xfs_read_agi() and set it if we are in a transaction
to avoid the problem in the future.

This is similar to how it is done in i.e. the dir3
and attr3 read functions.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 6b10b23c

fs/xfs/libxfs/xfs_ialloc.c

+2 −2
Original line number Diff line number Diff line
@@ -2450,8 +2450,6 @@ xfs_ialloc_log_agi( 
	ASSERT(agi->agi_magicnum == cpu_to_be32(XFS_AGI_MAGIC));

#endif



	xfs_trans_buf_set_type(tp, bp, XFS_BLFT_AGI_BUF);



	/*

	 * Compute byte offsets for the first and last fields in the first

	 * region and log the agi buffer. This only logs up through
@@ -2592,6 +2590,8 @@ xfs_read_agi( 
			XFS_FSS_TO_BB(mp, 1), 0, bpp, &xfs_agi_buf_ops);

	if (error)

		return error;

	if (tp)

		xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_AGI_BUF);



	xfs_buf_set_ref(*bpp, XFS_AGI_REF);

	return 0;

fs/xfs/xfs_inode.c

+0 −2
Original line number Diff line number Diff line
@@ -2041,7 +2041,6 @@ xfs_iunlink( 
	agi->agi_unlinked[bucket_index] = cpu_to_be32(agino);

	offset = offsetof(xfs_agi_t, agi_unlinked) +

		(sizeof(xfs_agino_t) * bucket_index);

	xfs_trans_buf_set_type(tp, agibp, XFS_BLFT_AGI_BUF);

	xfs_trans_log_buf(tp, agibp, offset,

			  (offset + sizeof(xfs_agino_t) - 1));

	return 0;
@@ -2133,7 +2132,6 @@ xfs_iunlink_remove( 
		agi->agi_unlinked[bucket_index] = cpu_to_be32(next_agino);

		offset = offsetof(xfs_agi_t, agi_unlinked) +

			(sizeof(xfs_agino_t) * bucket_index);

		xfs_trans_buf_set_type(tp, agibp, XFS_BLFT_AGI_BUF);

		xfs_trans_log_buf(tp, agibp, offset,

				  (offset + sizeof(xfs_agino_t) - 1));

	} else {

fs/xfs/xfs_log_recover.c

+0 −1
Original line number Diff line number Diff line
@@ -4929,7 +4929,6 @@ xlog_recover_clear_agi_bucket( 
	agi->agi_unlinked[bucket] = cpu_to_be32(NULLAGINO);

	offset = offsetof(xfs_agi_t, agi_unlinked) +

		 (sizeof(xfs_agino_t) * bucket);

	xfs_trans_buf_set_type(tp, agibp, XFS_BLFT_AGI_BUF);

	xfs_trans_log_buf(tp, agibp, offset,

			  (offset + sizeof(xfs_agino_t) - 1));