xfs: lock the AIL before removing the buffer item

dgchinner · Ben Myers · commit 4885235806bb · 2013-09-24T12:31:41.000-05:00
Regression introduced by commit 46f9d2e ("xfs: aborted buf items can be in the AIL") which fails to lock the AIL before removing the item. Spinlock debugging throws a warning about this. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Mark Tinguely <tinguely@sgi.com> Signed-off-by: Ben Myers <bpm@sgi.com>
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
@@ -628,6 +628,7 @@ xfs_buf_item_unlock(
 		else if (aborted) {
 			ASSERT(XFS_FORCED_SHUTDOWN(lip->li_mountp));
 			if (lip->li_flags & XFS_LI_IN_AIL) {
+				spin_lock(&lip->li_ailp->xa_lock);
 				xfs_trans_ail_delete(lip->li_ailp, lip,
 						     SHUTDOWN_LOG_IO_ERROR);
 			}

Original file line number	Diff line number	Diff line change
`@@ -628,6 +628,7 @@ xfs_buf_item_unlock(`
`628`	`628`	`else if (aborted) {`
`629`	`629`	`ASSERT(XFS_FORCED_SHUTDOWN(lip->li_mountp));`
`630`	`630`	`if (lip->li_flags & XFS_LI_IN_AIL) {`
	`631`	`+ spin_lock(&lip->li_ailp->xa_lock);`
`631`	`632`	`xfs_trans_ail_delete(lip->li_ailp, lip,`
`632`	`633`	`SHUTDOWN_LOG_IO_ERROR);`
`633`	`634`	`}`