xfs: use bitops interface for buf log item AIL flag check
PATCH 1/1 xfs: use bitops interface for buf log item AIL flag check
The xfs_log_item flags were converted to atomic bitops as of commit 22525c17ed ("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.
--- fs/xfs/xfs_buf_item.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/xfs/xfs_buf_item.c +1 -1
@@ -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))
Signature · 1 line
2.20.1
Quoted 7 lines · Brian Foster
The
xfs_log_itemflags were converted to atomic bitops as of commit22525c17ed("xfs: log item flags are racy"). The assert check for AIL presence inxfs_buf_item_relse()still uses the old value based check. This likely went unnoticed asXFS_LI_IN_AILevaluates to 0 and causes the assert to unconditionally pass. Fix up the check.Signed-off-by Brian Foster <[email protected]>
Whoops.
Quoted 18 lines
--- fs/xfs/xfs_buf_item.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/xfs/xfs_buf_item.c +1
-1@@ -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))
Darrick J. Wong
Reviewed-byQuoted 7 lines · Eric Sandeen
Quoted 6 lines · Brian Foster
The
xfs_log_itemflags were converted to atomic bitops as of commit22525c17ed("xfs: log item flags are racy"). The assert check for AIL presence inxfs_buf_item_relse()still uses the old value based check. This likely went unnoticed asXFS_LI_IN_AILevaluates to 0 and causes the assert to unconditionally pass. Fix up the check.
Quoted 7 lines
Quoted 1 line
Signed-off-by Brian Foster <[email protected]>Whoops.
Fixes 22525c17ed ("xfs: log item flags are racy")Reviewed-by Eric Sandeen <[email protected]>
Looks ok to me,
--D
Quoted 18 lines
Quoted 18 lines
--- fs/xfs/xfs_buf_item.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/xfs/xfs_buf_item.c +1
-1@@ -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))