1 files changed, 17 insertions, 22 deletions

diff --git a/fs/xfs/quota/xfs_dquot.c b/fs/xfs/quota/xfs_dquot.c
index f2705f2fd43c..591ca6602bfb 100644
--- a/fs/xfs/quota/xfs_dquot.c
+++ b/fs/xfs/quota/xfs_dquot.c
@@ -101,7 +101,7 @@ xfs_qm_dqinit(
         if (brandnewdquot) {
                 dqp->dq_flnext = dqp->dq_flprev = dqp;
                 mutex_init(&dqp->q_qlock);
-                sv_init(&dqp->q_pinwait, SV_DEFAULT, "pdq");
+                init_waitqueue_head(&dqp->q_pinwait);
 
                 /*
                  * Because we want to use a counting completion, complete
@@ -131,7 +131,7 @@ xfs_qm_dqinit(
                  dqp->q_res_bcount = 0;
                  dqp->q_res_icount = 0;
                  dqp->q_res_rtbcount = 0;
-                 dqp->q_pincount = 0;
+                 atomic_set(&dqp->q_pincount, 0);
                  dqp->q_hash = NULL;
                  ASSERT(dqp->dq_flnext == dqp->dq_flprev);
 
@@ -1221,16 +1221,14 @@ xfs_qm_dqflush(
         xfs_dqtrace_entry(dqp, "DQFLUSH");
 
         /*
-         * If not dirty, nada.
+         * If not dirty, or it's pinned and we are not supposed to
+         * block, nada.
          */
-        if (!XFS_DQ_IS_DIRTY(dqp)) {
+        if (!XFS_DQ_IS_DIRTY(dqp) ||
+            (!(flags & XFS_QMOPT_SYNC) && atomic_read(&dqp->q_pincount) > 0)) {
                 xfs_dqfunlock(dqp);
-                return (0);
+                return 0;
         }
-
-        /*
-         * Cant flush a pinned dquot. Wait for it.
-         */
         xfs_qm_dqunpin_wait(dqp);
 
         /*
@@ -1274,10 +1272,8 @@ xfs_qm_dqflush(
         dqp->dq_flags &= ~(XFS_DQ_DIRTY);
         mp = dqp->q_mount;
 
-        /* lsn is 64 bits */
-        spin_lock(&mp->m_ail_lock);
-        dqp->q_logitem.qli_flush_lsn = dqp->q_logitem.qli_item.li_lsn;
-        spin_unlock(&mp->m_ail_lock);
+        xfs_trans_ail_copy_lsn(mp->m_ail, &dqp->q_logitem.qli_flush_lsn,
+                                        &dqp->q_logitem.qli_item.li_lsn);
 
         /*
          * Attach an iodone routine so that we can remove this dquot from the
@@ -1323,8 +1319,10 @@ xfs_qm_dqflush_done(
         xfs_dq_logitem_t        *qip)
 {
         xfs_dquot_t             *dqp;
+        struct xfs_ail          *ailp;
 
         dqp = qip->qli_dquot;
+        ailp = qip->qli_item.li_ailp;
 
         /*
          * We only want to pull the item from the AIL if its
@@ -1337,15 +1335,12 @@ xfs_qm_dqflush_done(
         if ((qip->qli_item.li_flags & XFS_LI_IN_AIL) &&
             qip->qli_item.li_lsn == qip->qli_flush_lsn) {
 
-                spin_lock(&dqp->q_mount->m_ail_lock);
-                /*
-                 * xfs_trans_delete_ail() drops the AIL lock.
-                 */
+                /* xfs_trans_ail_delete() drops the AIL lock. */
+                spin_lock(&ailp->xa_lock);
                 if (qip->qli_item.li_lsn == qip->qli_flush_lsn)
-                        xfs_trans_delete_ail(dqp->q_mount,
-                                             (xfs_log_item_t*)qip);
+                        xfs_trans_ail_delete(ailp, (xfs_log_item_t*)qip);
                 else
-                        spin_unlock(&dqp->q_mount->m_ail_lock);
+                        spin_unlock(&ailp->xa_lock);
         }
 
         /*
@@ -1375,7 +1370,7 @@ xfs_dqunlock(
         mutex_unlock(&(dqp->q_qlock));
         if (dqp->q_logitem.qli_dquot == dqp) {
                 /* Once was dqp->q_mount, but might just have been cleared */
-                xfs_trans_unlocked_item(dqp->q_logitem.qli_item.li_mountp,
+                xfs_trans_unlocked_item(dqp->q_logitem.qli_item.li_ailp,
                                         (xfs_log_item_t*)&(dqp->q_logitem));
         }
 }
@@ -1489,7 +1484,7 @@ xfs_qm_dqpurge(
                                 "xfs_qm_dqpurge: dquot %p flush failed", dqp);
                 xfs_dqflock(dqp);
         }
-        ASSERT(dqp->q_pincount == 0);
+        ASSERT(atomic_read(&dqp->q_pincount) == 0);
         ASSERT(XFS_FORCED_SHUTDOWN(mp) ||
                !(dqp->q_logitem.qli_item.li_flags & XFS_LI_IN_AIL));