X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Flquota_disk.c;h=3d267ef96a450cca14647efef5ecc7fffa6e7d1b;hb=ca209745ef7d4e33ed0ba8fe8a3fe2ea6ed4eb8a;hp=b5d6adb6afdc26987c19abd4a8800b301d05a3ab;hpb=98060d83459ba10409f295898f0ec917f938b4d3;p=fs%2Flustre-release.git

diff --git a/lustre/quota/lquota_disk.c b/lustre/quota/lquota_disk.c
index b5d6adb..3d267ef 100644
--- a/lustre/quota/lquota_disk.c
+++ b/lustre/quota/lquota_disk.c
@@ -48,10 +48,6 @@
  * - lquota_disk_update_ver:	  update version of an index file
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
 #define DEBUG_SUBSYSTEM S_LQUOTA
 
 #include "lquota_internal.h"
@@ -184,7 +180,7 @@ struct dt_object *lquota_disk_dir_find_create(const struct lu_env *env,
 			GOTO(out, rc);
 
 		parent = dt_locate_at(env, dev, &qti->qti_fid,
-				      dev->dd_lu_dev.ld_site->ls_top_dev);
+				      dev->dd_lu_dev.ld_site->ls_top_dev, NULL);
 		if (IS_ERR(parent))
 			GOTO(out, rc = PTR_ERR(parent));
 	} else {
@@ -248,14 +244,13 @@ struct dt_object *lquota_disk_glb_find_create(const struct lu_env *env,
 	CDEBUG(D_QUOTA, "look-up/create %sglobal idx file ("DFID")\n",
 	       local ? "local " : "", PFID(fid));
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,7,50,0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 53, 0)
 	/* we use different index feature for each quota type and target type
 	 * for the time being. This is done for on-disk conversion from the old
 	 * quota format. Once this is no longer required, we should just be
 	 * using dt_quota_glb_features for all global index file */
 	idx_feat = glb_idx_feature(fid);
 #else
-#warning "remove old quota compatibility code"
 	idx_feat = &dt_quota_glb_features;
 #endif
 
@@ -682,7 +677,7 @@ int lquota_disk_write(const struct lu_env *env, struct thandle *th,
 			rc = dt_insert(env, obj, (struct dt_rec *)&qti->qti_rec,
 				       key, th, BYPASS_CAPA, 1);
 			LASSERTF(rc == 0, "failed to insert record in quota "
-			         "index "DFID,
+				 "index "DFID"\n",
 				 PFID(lu_object_fid(&obj->do_lu)));
 			GOTO(out, rc);
 		}