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

Commit fb1755a6 authored by Carlos Maiolino's avatar Carlos Maiolino Committed by Darrick J. Wong
Browse files

Split buffer's b_fspriv field 



By splitting the b_fspriv field into two different fields (b_log_item
and b_li_list). It's possible to get rid of an old ABI workaround, by
using the new b_log_item field to store xfs_buf_log_item separated from
the log items attached to the buffer, which will be linked in the new
b_li_list field.

This way, there is no more need to reorder the log items list to place
the buf_log_item at the beginning of the list, simplifying a bit the
logic to handle buffer IO.

This also opens the possibility to change buffer's log items list into a
proper list_head.

b_log_item field is still defined as a void *, because it is still used
by the log buffers to store xlog_in_core structures, and there is no
need to add an extra field on xfs_buf just for xlog_in_core.

Signed-off-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: default avatarBill O'Donnell <billodo@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
[darrick: minor style changes]
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 70a20655

fs/xfs/libxfs/xfs_alloc.c

+4 −4
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ xfs_agfl_write_verify( 
	struct xfs_buf	*bp)

{

	struct xfs_mount	*mp = bp->b_target->bt_mount;

	struct xfs_buf_log_item	*bip = bp->b_fspriv;

	struct xfs_buf_log_item	*bip = bp->b_log_item;

	xfs_failaddr_t		fa;



	/* no verification of non-crc AGFLs */
@@ -2488,7 +2488,7 @@ xfs_agf_write_verify( 
	struct xfs_buf	*bp)

{

	struct xfs_mount	*mp = bp->b_target->bt_mount;

	struct xfs_buf_log_item	*bip = bp->b_fspriv;

	struct xfs_buf_log_item	*bip = bp->b_log_item;

	xfs_failaddr_t		fa;



	fa = xfs_agf_verify(bp);

fs/xfs/libxfs/xfs_attr_leaf.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ xfs_attr3_leaf_write_verify( 
	struct xfs_buf	*bp)

{

	struct xfs_mount	*mp = bp->b_target->bt_mount;

	struct xfs_buf_log_item	*bip = bp->b_fspriv;

	struct xfs_buf_log_item	*bip = bp->b_log_item;

	struct xfs_attr3_leaf_hdr *hdr3 = bp->b_addr;

	xfs_failaddr_t		fa;

fs/xfs/libxfs/xfs_btree.c

+2 −2
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ xfs_btree_lblock_calc_crc( 
	struct xfs_buf		*bp)

{

	struct xfs_btree_block	*block = XFS_BUF_TO_BLOCK(bp);

	struct xfs_buf_log_item	*bip = bp->b_fspriv;

	struct xfs_buf_log_item	*bip = bp->b_log_item;



	if (!xfs_sb_version_hascrc(&bp->b_target->bt_mount->m_sb))

		return;
@@ -311,7 +311,7 @@ xfs_btree_sblock_calc_crc( 
	struct xfs_buf		*bp)

{

	struct xfs_btree_block	*block = XFS_BUF_TO_BLOCK(bp);

	struct xfs_buf_log_item	*bip = bp->b_fspriv;

	struct xfs_buf_log_item	*bip = bp->b_log_item;



	if (!xfs_sb_version_hascrc(&bp->b_target->bt_mount->m_sb))

		return;

fs/xfs/libxfs/xfs_da_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ xfs_da3_node_write_verify( 
	struct xfs_buf	*bp)

{

	struct xfs_mount	*mp = bp->b_target->bt_mount;

	struct xfs_buf_log_item	*bip = bp->b_fspriv;

	struct xfs_buf_log_item	*bip = bp->b_log_item;

	struct xfs_da3_node_hdr *hdr3 = bp->b_addr;

	xfs_failaddr_t		fa;

fs/xfs/libxfs/xfs_dir2_block.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ xfs_dir3_block_write_verify( 
	struct xfs_buf	*bp)

{

	struct xfs_mount	*mp = bp->b_target->bt_mount;

	struct xfs_buf_log_item	*bip = bp->b_fspriv;

	struct xfs_buf_log_item	*bip = bp->b_log_item;

	struct xfs_dir3_blk_hdr	*hdr3 = bp->b_addr;

	xfs_failaddr_t		fa;