LU-2509 quota: various code cleanups

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

diff --git a/lustre/quota/lquota_lib.c b/lustre/quota/lquota_lib.c
index 5278818..5bc2c9b 100644 (file)
--- a/lustre/quota/lquota_lib.c
+++ b/lustre/quota/lquota_lib.c
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2011, 2012, Intel, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann.lombardi@intel.com>
@@ -40,6 +40,19 @@
 
 #include "lquota_internal.h"
 
+cfs_mem_cache_t *lqe_kmem;
+
+struct lu_kmem_descr lquota_caches[] = {
+       {
+               .ckd_cache = &lqe_kmem,
+               .ckd_name  = "lqe_kmem",
+               .ckd_size  = sizeof(struct lquota_entry)
+       },
+       {
+               .ckd_cache = NULL
+       }
+};
+
 /* register lquota key */
 LU_KEY_INIT_FINI(lquota, struct lquota_thread_info);
 LU_CONTEXT_KEY_DEFINE(lquota, LCT_MD_THREAD | LCT_DT_THREAD | LCT_LOCAL);
@@ -244,7 +257,7 @@ void lquota_generate_fid(struct lu_fid *fid, int pool_id, int pool_type,
  * Helper routine used to extract pool ID, pool type and quota type from a
  * given FID.
  */
-int lquota_extract_fid(struct lu_fid *fid, int *pool_id, int *pool_type,
+int lquota_extract_fid(const struct lu_fid *fid, int *pool_id, int *pool_type,
                       int *quota_type)
 {
        unsigned int     tmp;
@@ -280,31 +293,96 @@ int lquota_extract_fid(struct lu_fid *fid, int *pool_id, int *pool_type,
        RETURN(0);
 }
 
-static int __init init_lquota(void)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,7,50,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
+ * objects and to handle the conversion from the old administrative quota file
+ * format */
+struct dt_index_features dt_quota_iusr_features;
+EXPORT_SYMBOL(dt_quota_iusr_features);
+struct dt_index_features dt_quota_busr_features;
+EXPORT_SYMBOL(dt_quota_busr_features);
+struct dt_index_features dt_quota_igrp_features;
+EXPORT_SYMBOL(dt_quota_igrp_features);
+struct dt_index_features dt_quota_bgrp_features;
+EXPORT_SYMBOL(dt_quota_bgrp_features);
+
+/**
+ * Helper routine returning the right index feature structure to be used
+ * depending on the FID of the global index.
+ */
+const struct dt_index_features *glb_idx_feature(struct lu_fid *fid)
 {
-       int     rc;
+       int     res_type, quota_type, rc;
 
-       /* call old quota module init function */
-       rc = init_lustre_quota();
+       rc = lquota_extract_fid(fid, NULL, &res_type, &quota_type);
        if (rc)
-               return rc;
+               return ERR_PTR(rc);
+
+       if (quota_type == USRQUOTA) {
+               if (res_type == LQUOTA_RES_MD)
+                       return &dt_quota_iusr_features;
+               else
+                       return &dt_quota_busr_features;
+       } else {
+               if (res_type == LQUOTA_RES_MD)
+                       return &dt_quota_igrp_features;
+               else
+                       return &dt_quota_bgrp_features;
+       }
+}
+#else
+#warning "remove old quota compatibility code"
+#endif
+
+static int __init init_lquota(void)
+{
+       int     rc;
+       ENTRY;
 
-       /* new quota initialization */
        lquota_key_init_generic(&lquota_thread_key, NULL);
        lu_context_key_register(&lquota_thread_key);
 
-       return 0;
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,7,50,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);
+       if (rc)
+               GOTO(out_key, rc);
+
+       rc = qmt_glb_init();
+       if (rc)
+               GOTO(out_caches, rc);
+
+       rc = qsd_glb_init();
+       if (rc)
+               GOTO(out_qmt, rc);
+
+       RETURN(0);
+
+out_qmt:
+       qmt_glb_fini();
+out_caches:
+       lu_kmem_fini(lquota_caches);
+out_key:
+       lu_context_key_degister(&lquota_thread_key);
+       return rc;
 }
 
 static void exit_lquota(void)
 {
-       /* call old quota module exit function */
-       exit_lustre_quota();
-
+       qsd_glb_fini();
+       qmt_glb_fini();
+       lu_kmem_fini(lquota_caches);
        lu_context_key_degister(&lquota_thread_key);
 }
 
-MODULE_AUTHOR("Intel, Inc. <http://www.intel.com/>");
+MODULE_AUTHOR("Intel Corporation <http://www.intel.com/>");
 MODULE_DESCRIPTION("Lustre Quota");
 MODULE_LICENSE("GPL");