From 9ee8ac315de83e4c6aa77f84194ebe913d643a7c Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Tue, 6 Dec 2011 21:58:21 +0000
Subject: [PATCH] --- yaml --- r: 280325 b: refs/heads/master c:
 28fb588c9bd810dec273d96e80591392f6ce1e1c h: refs/heads/master i:   280323:
 c357e90b465443ae8b400456518b32318e6f3664 v: v3

---
 [refs]                |  2 +-
 trunk/fs/xfs/xfs_qm.c | 22 +++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 5cf9289a8063..6b79dbedf312 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 093019cf1b18dd31b2c3b77acce4e000e2cbc9ce
+refs/heads/master: 28fb588c9bd810dec273d96e80591392f6ce1e1c
diff --git a/trunk/fs/xfs/xfs_qm.c b/trunk/fs/xfs/xfs_qm.c
index b8df0bda5a54..671f37eae1c7 100644
--- a/trunk/fs/xfs/xfs_qm.c
+++ b/trunk/fs/xfs/xfs_qm.c
@@ -449,7 +449,6 @@ 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));
@@ -462,25 +461,14 @@ xfs_qm_detach_gdquots(
 			mutex_lock(&q->qi_dqlist_lock);
 			goto again;
 		}
-		if ((gdqp = dqp->q_gdquot)) {
-			xfs_dqlock(gdqp);
+
+		gdqp = dqp->q_gdquot;
+		if (gdqp)
 			dqp->q_gdquot = NULL;
-		}
 		xfs_dqunlock(dqp);
 
-		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;
-		}
+		if (gdqp)
+			xfs_qm_dqrele(gdqp);
 	}
 }