LU-1842 quota: add per-filesystem information

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

diff --git a/lustre/quota/lquota_lib.c b/lustre/quota/lquota_lib.c
index d7e2703..67145e3 100644 (file)
--- a/lustre/quota/lquota_lib.c
+++ b/lustre/quota/lquota_lib.c
@@ -40,10 +40,6 @@
 
 #include "lquota_internal.h"
 
-static int hash_lqs_cur_bits = HASH_LQS_CUR_BITS;
-CFS_MODULE_PARM(hash_lqs_cur_bits, "i", int, 0444,
-               "the current bits of lqs hash");
-
 /* 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);
@@ -329,7 +325,9 @@ const struct dt_index_features *glb_idx_feature(struct lu_fid *fid)
 
 static int __init init_lquota(void)
 {
-       /* new quota initialization */
+       int     rc;
+       ENTRY;
+
        lquota_key_init_generic(&lquota_thread_key, NULL);
        lu_context_key_register(&lquota_thread_key);
 
@@ -340,11 +338,27 @@ static int __init init_lquota(void)
 #warning "remove old quota compatibility code"
 #endif
 
-       return 0;
+       rc = qmt_glb_init();
+       if (rc)
+               GOTO(out_key, rc);
+
+       rc = qsd_glb_init();
+       if (rc)
+               GOTO(out_qmt, rc);
+
+       RETURN(0);
+
+out_qmt:
+       qmt_glb_fini();
+out_key:
+       lu_context_key_degister(&lquota_thread_key);
+       return rc;
 }
 
 static void exit_lquota(void)
 {
+       qsd_glb_fini();
+       qmt_glb_fini();
        lu_context_key_degister(&lquota_thread_key);
 }