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

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

xfs: add helper for updating checksums on xfs_bufs 



Many/most callers of xfs_update_cksum() pass bp->b_addr and
BBTOB(bp->b_length) as the first 2 args.  Add a helper
which can just accept the bp and the crc offset, and work
it out on its own, for brevity.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 51582170

fs/xfs/xfs_alloc.c

+2 −2
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ xfs_agfl_write_verify( 
	if (bip)

		XFS_BUF_TO_AGFL(bp)->agfl_lsn = cpu_to_be64(bip->bli_item.li_lsn);



	xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length), XFS_AGFL_CRC_OFF);

	xfs_buf_update_cksum(bp, XFS_AGFL_CRC_OFF);

}



const struct xfs_buf_ops xfs_agfl_buf_ops = {
@@ -2269,7 +2269,7 @@ xfs_agf_write_verify( 
	if (bip)

		XFS_BUF_TO_AGF(bp)->agf_lsn = cpu_to_be64(bip->bli_item.li_lsn);



	xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length), XFS_AGF_CRC_OFF);

	xfs_buf_update_cksum(bp, XFS_AGF_CRC_OFF);

}



const struct xfs_buf_ops xfs_agf_buf_ops = {

fs/xfs/xfs_attr_leaf.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ xfs_attr3_leaf_write_verify( 
	if (bip)

		hdr3->info.lsn = cpu_to_be64(bip->bli_item.li_lsn);



	xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length), XFS_ATTR3_LEAF_CRC_OFF);

	xfs_buf_update_cksum(bp, XFS_ATTR3_LEAF_CRC_OFF);

}



/*

fs/xfs/xfs_btree.c

+2 −4
Original line number Diff line number Diff line
@@ -234,8 +234,7 @@ xfs_btree_lblock_calc_crc( 
		return;

	if (bip)

		block->bb_u.l.bb_lsn = cpu_to_be64(bip->bli_item.li_lsn);

	xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length),

			 XFS_BTREE_LBLOCK_CRC_OFF);

	xfs_buf_update_cksum(bp, XFS_BTREE_LBLOCK_CRC_OFF);

}



bool
@@ -267,8 +266,7 @@ xfs_btree_sblock_calc_crc( 
		return;

	if (bip)

		block->bb_u.s.bb_lsn = cpu_to_be64(bip->bli_item.li_lsn);

	xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length),

			 XFS_BTREE_SBLOCK_CRC_OFF);

	xfs_buf_update_cksum(bp, XFS_BTREE_SBLOCK_CRC_OFF);

}



bool

fs/xfs/xfs_buf.h

+7 −0
Original line number Diff line number Diff line
@@ -376,6 +376,13 @@ xfs_buf_verify_cksum(struct xfs_buf *bp, unsigned long cksum_offset) 
				cksum_offset);

}



static inline void

xfs_buf_update_cksum(struct xfs_buf *bp, unsigned long cksum_offset)

{

	xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length),

			 cksum_offset);

}



/*

 *	Handling of buftargs.

 */

fs/xfs/xfs_da_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ xfs_da3_node_write_verify( 
	if (bip)

		hdr3->info.lsn = cpu_to_be64(bip->bli_item.li_lsn);



	xfs_update_cksum(bp->b_addr, BBTOB(bp->b_length), XFS_DA3_NODE_CRC_OFF);

	xfs_buf_update_cksum(bp, XFS_DA3_NODE_CRC_OFF);

}



/*