summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_dquot.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2015-08-19 02:10:47 +0200
committerDave Chinner <david@fromorbit.com>2015-08-19 02:10:47 +0200
commit5be203ad115c1d8294e8685253e05fcea0202e04 (patch)
treefb30d691376436a934ab117fa8d5ff4a8f5bc508 /fs/xfs/xfs_dquot.c
parentMerge branch 'xfs-meta-uuid' into for-next (diff)
parentxfs: add missing bmap cancel calls in error paths (diff)
downloadlinux-5be203ad115c1d8294e8685253e05fcea0202e04.tar.xz
linux-5be203ad115c1d8294e8685253e05fcea0202e04.zip
Merge branch 'xfs-efi-rework' into for-next
Diffstat (limited to 'fs/xfs/xfs_dquot.c')
-rw-r--r--fs/xfs/xfs_dquot.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index 4143dc75dca4..6964d7ceba96 100644
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -954,12 +954,8 @@ xfs_qm_dqflush(
struct xfs_log_item *lip = &dqp->q_logitem.qli_item;
dqp->dq_flags &= ~XFS_DQ_DIRTY;
- spin_lock(&mp->m_ail->xa_lock);
- if (lip->li_flags & XFS_LI_IN_AIL)
- xfs_trans_ail_delete(mp->m_ail, lip,
- SHUTDOWN_CORRUPT_INCORE);
- else
- spin_unlock(&mp->m_ail->xa_lock);
+ xfs_trans_ail_remove(lip, SHUTDOWN_CORRUPT_INCORE);
+
error = -EIO;
goto out_unlock;
}