1 files changed, 11 insertions, 16 deletions

diff --git a/fs/xfs/quota/xfs_dquot_item.c b/fs/xfs/quota/xfs_dquot_item.c
index ddb61fe22a5c..1800e8d1f646 100644
--- a/fs/xfs/quota/xfs_dquot_item.c
+++ b/fs/xfs/quota/xfs_dquot_item.c
@@ -94,14 +94,13 @@ STATIC void
 xfs_qm_dquot_logitem_pin(
         xfs_dq_logitem_t *logitem)
 {
-        unsigned long   s;
         xfs_dquot_t *dqp;
 
         dqp = logitem->qli_dquot;
         ASSERT(XFS_DQ_IS_LOCKED(dqp));
-        s = XFS_DQ_PINLOCK(dqp);
+        spin_lock(&(XFS_DQ_TO_QINF(dqp)->qi_pinlock));
         dqp->q_pincount++;
-        XFS_DQ_PINUNLOCK(dqp, s);
+        spin_unlock(&(XFS_DQ_TO_QINF(dqp)->qi_pinlock));
 }
 
 /*
@@ -115,17 +114,16 @@ xfs_qm_dquot_logitem_unpin(
         xfs_dq_logitem_t *logitem,
         int               stale)
 {
-        unsigned long   s;
         xfs_dquot_t *dqp;
 
         dqp = logitem->qli_dquot;
         ASSERT(dqp->q_pincount > 0);
-        s = XFS_DQ_PINLOCK(dqp);
+        spin_lock(&(XFS_DQ_TO_QINF(dqp)->qi_pinlock));
         dqp->q_pincount--;
         if (dqp->q_pincount == 0) {
                 sv_broadcast(&dqp->q_pinwait);
         }
-        XFS_DQ_PINUNLOCK(dqp, s);
+        spin_unlock(&(XFS_DQ_TO_QINF(dqp)->qi_pinlock));
 }
 
 /* ARGSUSED */
@@ -189,8 +187,6 @@ void
 xfs_qm_dqunpin_wait(
         xfs_dquot_t     *dqp)
 {
-        SPLDECL(s);
-
         ASSERT(XFS_DQ_IS_LOCKED(dqp));
         if (dqp->q_pincount == 0) {
                 return;
@@ -200,9 +196,9 @@ xfs_qm_dqunpin_wait(
          * Give the log a push so we don't wait here too long.
          */
         xfs_log_force(dqp->q_mount, (xfs_lsn_t)0, XFS_LOG_FORCE);
-        s = XFS_DQ_PINLOCK(dqp);
+        spin_lock(&(XFS_DQ_TO_QINF(dqp)->qi_pinlock));
         if (dqp->q_pincount == 0) {
-                XFS_DQ_PINUNLOCK(dqp, s);
+                spin_unlock(&(XFS_DQ_TO_QINF(dqp)->qi_pinlock));
                 return;
         }
         sv_wait(&(dqp->q_pinwait), PINOD,
@@ -216,8 +212,8 @@ xfs_qm_dqunpin_wait(
  * If so, we want to push it out to help us take this item off the AIL as soon
  * as possible.
  *
- * We must not be holding the AIL_LOCK at this point. Calling incore() to
- * search the buffer cache can be a time consuming thing, and AIL_LOCK is a
+ * We must not be holding the AIL lock at this point. Calling incore() to
+ * search the buffer cache can be a time consuming thing, and AIL lock is a
  * spinlock.
  */
 STATIC void
@@ -322,7 +318,7 @@ xfs_qm_dquot_logitem_trylock(
                  * want to do that now since we might sleep in the device
                  * strategy routine.  We also don't want to grab the buffer lock
                  * here because we'd like not to call into the buffer cache
-                 * while holding the AIL_LOCK.
+                 * while holding the AIL lock.
                  * Make sure to only return PUSHBUF if we set pushbuf_flag
                  * ourselves.  If someone else is doing it then we don't
                  * want to go to the push routine and duplicate their efforts.
@@ -562,15 +558,14 @@ xfs_qm_qoffend_logitem_committed(
         xfs_lsn_t lsn)
 {
         xfs_qoff_logitem_t      *qfs;
-        SPLDECL(s);
 
         qfs = qfe->qql_start_lip;
-        AIL_LOCK(qfs->qql_item.li_mountp,s);
+        spin_lock(&qfs->qql_item.li_mountp->m_ail_lock);
         /*
          * Delete the qoff-start logitem from the AIL.
          * xfs_trans_delete_ail() drops the AIL lock.
          */
-        xfs_trans_delete_ail(qfs->qql_item.li_mountp, (xfs_log_item_t *)qfs, s);
+        xfs_trans_delete_ail(qfs->qql_item.li_mountp, (xfs_log_item_t *)qfs);
         kmem_free(qfs, sizeof(xfs_qoff_logitem_t));
         kmem_free(qfe, sizeof(xfs_qoff_logitem_t));
         return (xfs_lsn_t)-1;