LU-15049 quota: fix a panic with pool number > 16

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

diff --git a/lustre/quota/qmt_entry.c b/lustre/quota/qmt_entry.c
index de9a314..da525a5 100644 (file)
--- a/lustre/quota/qmt_entry.c
+++ b/lustre/quota/qmt_entry.c
@@ -186,7 +186,7 @@ static void qmt_lqe_debug(struct lquota_entry *lqe, void *arg,
 /*
  * Vector of quota entry operations supported on the master
  */
-struct lquota_entry_operations qmt_lqe_ops = {
+const struct lquota_entry_operations qmt_lqe_ops = {
        .lqe_init       = qmt_lqe_init,
        .lqe_read       = qmt_lqe_read,
        .lqe_debug      = qmt_lqe_debug,
@@ -252,7 +252,8 @@ struct thandle *qmt_trans_start_with_slv(const struct lu_env *env,
 
        if (slv_obj != NULL) {
                /* reserve credits for slave index update */
-               rc = lquota_disk_declare_write(env, th, slv_obj, &lqe->lqe_id);
+               rc = lquota_disk_declare_write(env, th, slv_obj,
+                                              &lqes[0]->lqe_id);
                if (rc)
                        GOTO(out, rc);
        }
@@ -267,7 +268,7 @@ out:
        if (rc) {
                dt_trans_stop(env, qmt->qmt_child, th);
                th = ERR_PTR(rc);
-               LQUOTA_ERROR(lqe, "failed to slv declare write for "DFID
+               LQUOTA_ERROR(lqes[0], "failed to slv declare write for "DFID
                             ", rc:%d", PFID(lu_object_fid(&slv_obj->do_lu)),
                             rc);
        } else {
@@ -801,8 +802,9 @@ bool qmt_adjust_edquot_qunit_notify(const struct lu_env *env,
        if (!lqe_gl->lqe_glbl_data &&
            (req_has_rep(qb_flags) || req_is_rel(qb_flags))) {
                if (need_reseed)
-                       CWARN("%s: can't notify - lge_glbl_data is not set",
-                             qmt->qmt_svname);
+                       CDEBUG(D_QUOTA,
+                              "%s: can not notify - lge_glbl_data is not set\n",
+                              qmt->qmt_svname);
                return need_reseed;
        }
 
@@ -857,7 +859,7 @@ void qmt_revalidate_lqes(const struct lu_env *env,
        }
 }
 
-inline void qti_lqes_init(const struct lu_env *env)
+void qti_lqes_init(const struct lu_env *env)
 {
        struct qmt_thread_info  *qti = qmt_info(env);
 
@@ -866,11 +868,11 @@ inline void qti_lqes_init(const struct lu_env *env)
        qti->qti_lqes_num = QMT_MAX_POOL_NUM;
 }
 
-inline int qti_lqes_add(const struct lu_env *env, struct lquota_entry *lqe)
+int qti_lqes_add(const struct lu_env *env, struct lquota_entry *lqe)
 {
        struct qmt_thread_info  *qti = qmt_info(env);
 
-       if (qti->qti_lqes_cnt > qti->qti_lqes_num) {
+       if (qti->qti_lqes_cnt >= qti->qti_lqes_num) {
                struct lquota_entry     **lqes;
                lqes = qti->qti_lqes;
                OBD_ALLOC(lqes, sizeof(lqe) * qti->qti_lqes_num * 2);
@@ -901,7 +903,7 @@ inline int qti_lqes_add(const struct lu_env *env, struct lquota_entry *lqe)
        return 0;
 }
 
-inline void qti_lqes_del(const struct lu_env *env, int index)
+void qti_lqes_del(const struct lu_env *env, int index)
 {
        struct lquota_entry     **lqes;
        int lqes_cnt = qti_lqes_cnt(env);
@@ -925,7 +927,7 @@ inline void qti_lqes_del(const struct lu_env *env, int index)
        qti_lqes_cnt(env)--;
 }
 
-inline void qti_lqes_fini(const struct lu_env *env)
+void qti_lqes_fini(const struct lu_env *env)
 {
        struct qmt_thread_info  *qti = qmt_info(env);
        struct lquota_entry     **lqes = qti->qti_lqes;
@@ -940,9 +942,12 @@ inline void qti_lqes_fini(const struct lu_env *env)
        if (qti->qti_lqes_num > QMT_MAX_POOL_NUM)
                OBD_FREE(qti->qti_lqes,
                         qti->qti_lqes_num * sizeof(struct lquota_entry *));
+
+       qti->qti_lqes_num = 0;
+       qti->qti_lqes_cnt = 0;
 }
 
-inline int qti_lqes_min_qunit(const struct lu_env *env)
+int qti_lqes_min_qunit(const struct lu_env *env)
 {
        int i, min, qunit;
 
@@ -955,7 +960,7 @@ inline int qti_lqes_min_qunit(const struct lu_env *env)
        return min;
 }
 
-inline int qti_lqes_edquot(const struct lu_env *env)
+int qti_lqes_edquot(const struct lu_env *env)
 {
        int i;
 
@@ -967,11 +972,11 @@ inline int qti_lqes_edquot(const struct lu_env *env)
        return 0;
 }
 
-inline int qti_lqes_restore_init(const struct lu_env *env)
+int qti_lqes_restore_init(const struct lu_env *env)
 {
        int rc = 0;
 
-       if (qti_lqes_cnt(env) > QMT_MAX_POOL_NUM) {
+       if (qti_lqes_inited(env) && qti_lqes_cnt(env) > QMT_MAX_POOL_NUM) {
                OBD_ALLOC(qmt_info(env)->qti_lqes_rstr,
                          qti_lqes_cnt(env) * sizeof(struct qmt_lqe_restore));
                if (!qti_lqes_rstr(env))
@@ -981,14 +986,14 @@ inline int qti_lqes_restore_init(const struct lu_env *env)
        return rc;
 }
 
-inline void qti_lqes_restore_fini(const struct lu_env *env)
+void qti_lqes_restore_fini(const struct lu_env *env)
 {
-       if (qti_lqes_cnt(env) > QMT_MAX_POOL_NUM)
+       if (qti_lqes_inited(env) && qti_lqes_cnt(env) > QMT_MAX_POOL_NUM)
                OBD_FREE(qmt_info(env)->qti_lqes_rstr,
                         qti_lqes_cnt(env) * sizeof(struct qmt_lqe_restore));
 }
 
-inline void qti_lqes_write_lock(const struct lu_env *env)
+void qti_lqes_write_lock(const struct lu_env *env)
 {
        int i;
 
@@ -996,7 +1001,7 @@ inline void qti_lqes_write_lock(const struct lu_env *env)
                lqe_write_lock(qti_lqes(env)[i]);
 }
 
-inline void qti_lqes_write_unlock(const struct lu_env *env)
+void qti_lqes_write_unlock(const struct lu_env *env)
 {
        int i;
 
@@ -1048,6 +1053,8 @@ void qmt_seed_glbe_all(const struct lu_env *env, struct lqe_glbl_data *lgd,
        int                      i, j, idx;
        ENTRY;
 
+       if (!qti_lqes_cnt(env))
+               RETURN_EXIT;
        /* lqes array is sorted by qunit - the first entry has minimum qunit.
         * Thus start seeding global qunit's array beginning from the 1st lqe
         * and appropriate pool. If pools overlapped, slaves from this