X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Flquota_lib.c;h=8bb7515eaa4016b85e3013c639e9ff89479c3707;hb=a4bcfa9c49abae8035b05d94a09352aae01bd77d;hp=c65465ca82140a27a1f09561de05ea8310107e7d;hpb=1b2547843817b4b7adbeb87ea9b070d9cac35c90;p=fs%2Flustre-release.git

diff --git a/lustre/quota/lquota_lib.c b/lustre/quota/lquota_lib.c
index c65465c..8bb7515 100644
--- a/lustre/quota/lquota_lib.c
+++ b/lustre/quota/lquota_lib.c
@@ -21,17 +21,13 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann.lombardi@intel.com>
  * Author: Niu    Yawei    <yawei.niu@intel.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
 #define DEBUG_SUBSYSTEM S_LQUOTA
 
 #include <linux/version.h>
@@ -194,7 +190,7 @@ int lquotactl_slv(const struct lu_env *env, struct dt_device *dev,
 
 	/* lookup record storing space accounting information for this ID */
 	rc = dt_lookup(env, obj, (struct dt_rec *)&qti->qti_acct_rec,
-		       (struct dt_key *)&key, BYPASS_CAPA);
+		       (struct dt_key *)&key);
 	if (rc < 0)
 		GOTO(out, rc);
 
@@ -216,7 +212,7 @@ int lquotactl_slv(const struct lu_env *env, struct dt_device *dev,
 	memset(&qti->qti_slv_rec, 0, sizeof(qti->qti_slv_rec));
 	/* lookup record storing enforcement information for this ID */
 	rc = dt_lookup(env, obj, (struct dt_rec *)&qti->qti_slv_rec,
-		       (struct dt_key *)&key, BYPASS_CAPA);
+		       (struct dt_key *)&key);
 	if (rc < 0 && rc != -ENOENT)
 		GOTO(out, rc = 0);
 
@@ -293,7 +289,7 @@ int lquota_extract_fid(const struct lu_fid *fid, int *pool_id, int *pool_type,
 	RETURN(0);
 }
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,7,50,0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0)
 /* Index features supported by the global index objects.
  * We actually use one dt_index_features structure for each quota combination
  * of quota type x [inode, block] to allow the ldiskfs OSD to recognize those
@@ -332,9 +328,7 @@ const struct dt_index_features *glb_idx_feature(struct lu_fid *fid)
 			return &dt_quota_bgrp_features;
 	}
 }
-#else
-#warning "remove old quota compatibility code"
-#endif
+#endif /* LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0) */
 
 static int __init init_lquota(void)
 {
@@ -344,11 +338,9 @@ static int __init init_lquota(void)
 	lquota_key_init_generic(&lquota_thread_key, NULL);
 	lu_context_key_register(&lquota_thread_key);
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,7,50,0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0)
 	dt_quota_iusr_features = dt_quota_busr_features = dt_quota_glb_features;
 	dt_quota_igrp_features = dt_quota_bgrp_features = dt_quota_glb_features;
-#else
-#warning "remove old quota compatibility code"
 #endif
 
 	rc = lu_kmem_init(lquota_caches);