[PATCH 026/102] xfs: simplify xfs_qm_detach_gdquots

[Dave Chinner <david@xxxxxxxxxxxxx>]

From: Christoph Hellwig <hch@xxxxxxxxxxxxx>

Upstream commit: 28fb588c9bd810dec273d96e80591392f6ce1e1c

There is no reason to drop qi_dqlist_lock around calls to xfs_qm_dqrele
because the free list lock now nests inside qi_dqlist_lock and the
dquot lock.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx>
Signed-off-by: Ben Myers <bpm@xxxxxxx>
---
 fs/xfs/quota/xfs_qm.c |   23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c
index 0785984..eacf7e0 100644
--- a/fs/xfs/quota/xfs_qm.c
+++ b/fs/xfs/quota/xfs_qm.c
@@ -518,31 +518,18 @@ xfs_qm_detach_gdquots(
 {
        struct xfs_quotainfo    *q = mp->m_quotainfo;
        struct xfs_dquot        *dqp, *gdqp;
-       int                     nrecl;
 
- again:
        ASSERT(mutex_is_locked(&q->qi_dqlist_lock));
        list_for_each_entry(dqp, &q->qi_dqlist, q_mplist) {
                xfs_dqlock(dqp);
-               if ((gdqp = dqp->q_gdquot)) {
-                       xfs_dqlock(gdqp);
+
+               gdqp = dqp->q_gdquot;
+               if (gdqp)
                        dqp->q_gdquot = NULL;
-               }
                xfs_dqunlock(dqp);
+               if (gdqp)
+                       xfs_qm_dqrele(gdqp);
 
-               if (gdqp) {
-                       /*
-                        * Can't hold the mplist lock across a dqput.
-                        * XXXmust convert to marker based iterations here.
-                        */
-                       nrecl = q->qi_dqreclaims;
-                       mutex_unlock(&q->qi_dqlist_lock);
-                       xfs_qm_dqput(gdqp);
-
-                       mutex_lock(&q->qi_dqlist_lock);
-                       if (nrecl != q->qi_dqreclaims)
-                               goto again;
-               }
        }
 }
 
-- 
1.7.10