Branch HEAD

[fs/lustre-release.git] / lustre / quota / quota_interface.c

diff --git a/lustre/quota/quota_interface.c b/lustre/quota/quota_interface.c
index f4374b7..5e1c51b 100644 (file)
--- a/lustre/quota/quota_interface.c
+++ b/lustre/quota/quota_interface.c
@@ -526,6 +526,11 @@ static int mds_quota_setup(struct obd_device *obd)
         int rc;
         ENTRY;
 
+        if (unlikely(mds->mds_quota)) {
+                CWARN("try to reinitialize quota context!\n");
+                RETURN(0);
+        }
+
         init_rwsem(&obt->obt_rwsem);
         obt->obt_qfmt = LUSTRE_QUOTA_V2;
         mds->mds_quota_info.qi_version = LUSTRE_QUOTA_V2;
@@ -544,7 +549,9 @@ static int mds_quota_setup(struct obd_device *obd)
 static int mds_quota_cleanup(struct obd_device *obd)
 {
         ENTRY;
-        obd->u.mds.mds_quota = 0;
+        if (unlikely(!obd->u.mds.mds_quota))
+                RETURN(0);
+
         qctxt_cleanup(&obd->u.obt.obt_qctxt, 0);
         RETURN(0);
 }
@@ -554,6 +561,9 @@ static int mds_quota_setinfo(struct obd_device *obd, void *data)
         struct lustre_quota_ctxt *qctxt = &obd->u.obt.obt_qctxt;
         ENTRY;
 
+        if (unlikely(!obd->u.mds.mds_quota))
+                RETURN(0);
+
         if (data != NULL)
                 QUOTA_MASTER_READY(qctxt);
         else
@@ -567,6 +577,10 @@ static int mds_quota_fs_cleanup(struct obd_device *obd)
         struct obd_quotactl oqctl;
         ENTRY;
 
+        if (unlikely(!mds->mds_quota))
+                RETURN(0);
+
+        mds->mds_quota = 0;
         memset(&oqctl, 0, sizeof(oqctl));
         oqctl.qc_type = UGQUOTA;