Merge remote-tracking branches 'asoc/topic/jz4740', 'asoc/topic/kirkwood', 'asoc...

[firefly-linux-kernel-4.4.55.git] / fs / xfs / xfs_inode_item.c

diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index bf13a5a7e2f4ffd90d1ae65402a240ac81e80349..62bd80f4edd9aacb74c254c70b3e9de8618ef988 100644 (file)
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -703,17 +703,10 @@ xfs_iflush_abort(
        xfs_inode_log_item_t    *iip = ip->i_itemp;
 
        if (iip) {
-               struct xfs_ail  *ailp = iip->ili_item.li_ailp;
                if (iip->ili_item.li_flags & XFS_LI_IN_AIL) {
-                       spin_lock(&ailp->xa_lock);
-                       if (iip->ili_item.li_flags & XFS_LI_IN_AIL) {
-                               /* xfs_trans_ail_delete() drops the AIL lock. */
-                               xfs_trans_ail_delete(ailp, &iip->ili_item,
-                                               stale ?
-                                                    SHUTDOWN_LOG_IO_ERROR :
+                       xfs_trans_ail_remove(&iip->ili_item,
+                                            stale ? SHUTDOWN_LOG_IO_ERROR :
                                                     SHUTDOWN_CORRUPT_INCORE);
-                       } else
-                               spin_unlock(&ailp->xa_lock);
                }
                iip->ili_logged = 0;
                /*