From: anserper <anserper>
Date: Thu, 20 Mar 2008 22:00:24 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: v1_8_0_110~661
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=31eabcc9c15e9bd98431d42a1fa9fe5fe42a6465;p=fs%2Flustre-release.git

Branch b1_6
b=14896
i=oleg.drokin
i=tianzy

additional handling of quota cleanup in case when no init was done
---

diff --git a/lustre/quota/quota_interface.c b/lustre/quota/quota_interface.c
index ada2ce6..519e8d2 100644
--- a/lustre/quota/quota_interface.c
+++ b/lustre/quota/quota_interface.c
@@ -265,6 +265,10 @@ static int filter_quota_clearinfo(struct obd_export *exp, struct obd_device *obd
 {
         struct lustre_quota_ctxt *qctxt = &obd->u.obt.obt_qctxt;
 
+        /* lquota may be not set up before destroying export, b=14896 */
+        if (!obd->obd_set_up)
+                return 0;
+
         /* when exp->exp_imp_reverse is destroyed, the corresponding lqc_import
          * should be invalid b=12374 */
         if (qctxt->lqc_import == exp->exp_imp_reverse) {