LU-506 kernel: Add config check for sb_any_quota_loaded

[fs/lustre-release.git] / lustre / mdd / mdd_quota.c

diff --git a/lustre/mdd/mdd_quota.c b/lustre/mdd/mdd_quota.c
index 7bc92cc..e2791e3 100644 (file)
--- a/lustre/mdd/mdd_quota.c
+++ b/lustre/mdd/mdd_quota.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -93,10 +93,11 @@ int mdd_quota_recovery(const struct lu_env *env, struct md_device *m)
 }
 
 int mdd_quota_check(const struct lu_env *env, struct md_device *m,
-                    struct obd_export *exp, __u32 type)
+                    __u32 type)
 {
         struct mdd_device *mdd = lu2mdd_dev(&m->md_lu_dev);
         struct obd_device *obd = mdd->mdd_obd_dev;
+        struct obd_export *exp = md_quota(env)->mq_exp;
         struct obd_quotactl *oqctl = &mdd_env_info(env)->mti_oqctl;
         int rc;
         ENTRY;
@@ -107,7 +108,7 @@ int mdd_quota_check(const struct lu_env *env, struct md_device *m,
 }
 
 int mdd_quota_on(const struct lu_env *env, struct md_device *m,
-                 __u32 type, __u32 id)
+                 __u32 type)
 {
         struct mdd_device *mdd = lu2mdd_dev(&m->md_lu_dev);
         struct obd_device *obd = mdd->mdd_obd_dev;
@@ -117,13 +118,12 @@ int mdd_quota_on(const struct lu_env *env, struct md_device *m,
 
         oqctl->qc_cmd = Q_QUOTAON;
         oqctl->qc_type = type;
-        oqctl->qc_id = id;
         rc = lquota_ctl(mds_quota_interface_ref, obd, oqctl);
         RETURN(rc);
 }
 
 int mdd_quota_off(const struct lu_env *env, struct md_device *m,
-                  __u32 type, __u32 id)
+                  __u32 type)
 {
         struct mdd_device *mdd = lu2mdd_dev(&m->md_lu_dev);
         struct obd_device *obd = mdd->mdd_obd_dev;
@@ -133,7 +133,6 @@ int mdd_quota_off(const struct lu_env *env, struct md_device *m,
 
         oqctl->qc_cmd = Q_QUOTAOFF;
         oqctl->qc_type = type;
-        oqctl->qc_id = id;
         rc = lquota_ctl(mds_quota_interface_ref, obd, oqctl);
         RETURN(rc);
 }