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

Commit 6363fdf7 authored by Brian Foster's avatar Brian Foster Committed by Greg Kroah-Hartman
Browse files

xfs: use bitops interface for buf log item AIL flag check 



commit 826f7e34130a4ce756138540170cbe935c537a47 upstream.

The xfs_log_item flags were converted to atomic bitops as of commit
22525c17 ("xfs: log item flags are racy"). The assert check for
AIL presence in xfs_buf_item_relse() still uses the old value based
check. This likely went unnoticed as XFS_LI_IN_AIL evaluates to 0
and causes the assert to unconditionally pass. Fix up the check.

Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Fixes: 22525c17 ("xfs: log item flags are racy")
Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a95582d9

fs/xfs/xfs_buf_item.c

+1 −1
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ xfs_buf_item_relse( 
	struct xfs_buf_log_item	*bip = bp->b_log_item;



	trace_xfs_buf_item_relse(bp, _RET_IP_);

	ASSERT(!(bip->bli_item.li_flags & XFS_LI_IN_AIL));

	ASSERT(!test_bit(XFS_LI_IN_AIL, &bip->bli_item.li_flags));



	bp->b_log_item = NULL;

	if (list_empty(&bp->b_li_list))