From 385e598a525bf36529fa3454f4943a869c7184e3 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Tue, 6 Dec 2011 21:58:11 +0000
Subject: [PATCH] --- yaml --- r: 280309 b: refs/heads/master c:
 f2fba558d3c80dcd10bbadbb8f05c78dc2860b95 h: refs/heads/master i:   280307:
 f916a340517690e59164faae95c20455775f1826 v: v3

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

diff --git a/[refs] b/[refs]
index d4fc04fd8c2a..a1d666370305 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdedf28b9492d69976110d12cc0d02d33c8ea7ea
+refs/heads/master: f2fba558d3c80dcd10bbadbb8f05c78dc2860b95
diff --git a/trunk/fs/xfs/xfs_qm.c b/trunk/fs/xfs/xfs_qm.c
index 93cafacbed3c..c704ea0115d5 100644
--- a/trunk/fs/xfs/xfs_qm.c
+++ b/trunk/fs/xfs/xfs_qm.c
@@ -1661,7 +1661,7 @@ xfs_qm_quotacheck(
 	 * successfully.
 	 */
 	if (!error)
-		error = xfs_qm_dqflush_all(mp, SYNC_TRYLOCK);
+		error = xfs_qm_dqflush_all(mp, 0);
 
 	/*
 	 * We can get this error if we couldn't do a dquot allocation inside