Whamcloud - gitweb
Branch b1_8_gate
authortianzy <tianzy>
Thu, 11 Sep 2008 14:51:40 +0000 (14:51 +0000)
committertianzy <tianzy>
Thu, 11 Sep 2008 14:51:40 +0000 (14:51 +0000)
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

lustre/quota/quota_ctl.c

index 178a54e..1e10b4e 100644 (file)
@@ -232,8 +232,8 @@ adjust:
                 else
                         gid = oqctl->qc_id;
 
-                rc = qctxt_adjust_qunit(obd, &obd->u.obt.obt_qctxt, 
-                                        uid, gid, 1, 0);
+                rc = qctxt_adjust_qunit(obd, &obd->u.obt.obt_qctxt,
+                                        uid, gid, 1, 0, NULL);
                 if (rc == -EDQUOT || rc == -EBUSY) {
                         CDEBUG(D_QUOTA, "rc: %d.\n", rc);
                         rc = 0;