From: tianzy <tianzy>
Date: Thu, 11 Sep 2008 14:51:37 +0000 (+0000)
Subject: Branch b1_8_gate
X-Git-Tag: v1_7_100~1^89
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=88192ff7280931aa6d3852c08bd27d37fa4794f9;p=fs%2Flustre-release.git

Branch b1_8_gate
This patch includes att18982, att18236, att18237,att18983 and att19061 in bz14840.
Slove "quota recovery deadlock during mds failover", it includes:
1. fix osts hang when mds does failover with quotaon
2. prevent watchdog storm when osts threads wait for the
   recovery of mds
b=14840
i=johann
i=shadow
i=panda
---

diff --git a/lustre/quota/quota_adjust_qunit.c b/lustre/quota/quota_adjust_qunit.c
index c959bc9..d2a33dd 100644
--- a/lustre/quota/quota_adjust_qunit.c
+++ b/lustre/quota/quota_adjust_qunit.c
@@ -341,8 +341,8 @@ int filter_quota_adjust_qunit(struct obd_export *exp,
                 uid = oqaq->qaq_id;
 
         if (rc > 0) {
-                rc = qctxt_adjust_qunit(obd, qctxt, uid, gid, 1, 0);
-                if (rc == -EDQUOT || rc == -EBUSY) {
+                rc = qctxt_adjust_qunit(obd, qctxt, uid, gid, 1, 0, NULL);
+                if (rc == -EDQUOT || rc == -EBUSY || rc == -EAGAIN) {
                         CDEBUG(D_QUOTA, "rc: %d.\n", rc);
                         rc = 0;
                 }