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

Commit c883d0c4 authored by Mark Tinguely's avatar Mark Tinguely Committed by Ben Myers
Browse files

xfs: fix the multi-segment log buffer format 



Per Dave Chinner suggestion, this patch:
 1) Corrects the detection of whether a multi-segment buffer is
    still tracking data.
 2) Clears all the buffer log formats for a multi-segment buffer.

Signed-off-by: default avatarMark Tinguely <tinguely@sgi.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 820a554f

fs/xfs/xfs_buf_item.c

+10 −3
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ xfs_buf_item_unlock( 
{

	struct xfs_buf_log_item	*bip = BUF_ITEM(lip);

	struct xfs_buf		*bp = bip->bli_buf;

	int			aborted;

	int			aborted, clean, i;

	uint			hold;



	/* Clear the buffer's association with this transaction. */
@@ -654,8 +654,15 @@ xfs_buf_item_unlock( 
	 * If the buf item isn't tracking any data, free it, otherwise drop the

	 * reference we hold to it.

	 */

	if (xfs_bitmap_empty(bip->__bli_format.blf_data_map,

			     bip->__bli_format.blf_map_size))

	clean = 1;

	for (i = 0; i < bip->bli_format_count; i++) {

		if (!xfs_bitmap_empty(bip->bli_formats[i].blf_data_map,

			     bip->bli_formats[i].blf_map_size)) {

			clean = 0;

			break;

		}

	}

	if (clean)

		xfs_buf_item_relse(bp);

	else

		atomic_dec(&bip->bli_refcount);

fs/xfs/xfs_trans_buf.c

+5 −2
Original line number Diff line number Diff line
@@ -643,6 +643,7 @@ xfs_trans_binval( 
	xfs_buf_t	*bp)

{

	xfs_buf_log_item_t	*bip = bp->b_fspriv;

	int			i;



	ASSERT(bp->b_transp == tp);

	ASSERT(bip != NULL);
@@ -670,8 +671,10 @@ xfs_trans_binval( 
	bip->bli_flags &= ~(XFS_BLI_INODE_BUF | XFS_BLI_LOGGED | XFS_BLI_DIRTY);

	bip->__bli_format.blf_flags &= ~XFS_BLF_INODE_BUF;

	bip->__bli_format.blf_flags |= XFS_BLF_CANCEL;

	memset((char *)(bip->__bli_format.blf_data_map), 0,

	      (bip->__bli_format.blf_map_size * sizeof(uint)));

	for (i = 0; i < bip->bli_format_count; i++) {

		memset(bip->bli_formats[i].blf_data_map, 0,

		       (bip->bli_formats[i].blf_map_size * sizeof(uint)));

	}

	bip->bli_item.li_desc->lid_flags |= XFS_LID_DIRTY;

	tp->t_flags |= XFS_TRANS_DIRTY;

}