LU-9725 quota: always deregister lwp

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

diff --git a/lustre/quota/qsd_lib.c b/lustre/quota/qsd_lib.c
index e10eeae..f4c37e6 100644 (file)
--- a/lustre/quota/qsd_lib.c
+++ b/lustre/quota/qsd_lib.c
@@ -85,6 +85,8 @@ static int qsd_state_seq_show(struct seq_file *m, void *data)
                strcat(enabled, "u");
        if (qsd_type_enabled(qsd, GRPQUOTA))
                strcat(enabled, "g");
+       if (qsd_type_enabled(qsd, PRJQUOTA))
+               strncat(enabled, "p", 1);
        if (strlen(enabled) == 0)
                strcat(enabled, "none");
 
@@ -103,18 +105,24 @@ static int qsd_state_seq_show(struct seq_file *m, void *data)
                        strcat(enabled, "u");
                if (qsd->qsd_type_array[GRPQUOTA]->qqi_acct_obj != NULL)
                        strcat(enabled, "g");
+               if (qsd->qsd_type_array[PRJQUOTA]->qqi_acct_obj != NULL)
+                       strncat(enabled, "p", 1);
                if (strlen(enabled) == 0)
                        strcat(enabled, "none");
                seq_printf(m, "space acct:     %s\n"
                           "user uptodate:  glb[%d],slv[%d],reint[%d]\n"
-                          "group uptodate: glb[%d],slv[%d],reint[%d]\n",
+                          "group uptodate: glb[%d],slv[%d],reint[%d]\n"
+                          "project uptodate: glb[%d],slv[%d],reint[%d]\n",
                           enabled,
                           qsd->qsd_type_array[USRQUOTA]->qqi_glb_uptodate,
                           qsd->qsd_type_array[USRQUOTA]->qqi_slv_uptodate,
                           qsd->qsd_type_array[USRQUOTA]->qqi_reint,
                           qsd->qsd_type_array[GRPQUOTA]->qqi_glb_uptodate,
                           qsd->qsd_type_array[GRPQUOTA]->qqi_slv_uptodate,
-                          qsd->qsd_type_array[GRPQUOTA]->qqi_reint);
+                          qsd->qsd_type_array[GRPQUOTA]->qqi_reint,
+                          qsd->qsd_type_array[PRJQUOTA]->qqi_glb_uptodate,
+                          qsd->qsd_type_array[PRJQUOTA]->qqi_slv_uptodate,
+                          qsd->qsd_type_array[PRJQUOTA]->qqi_reint);
        }
        return 0;
 }
@@ -132,6 +140,8 @@ static int qsd_enabled_seq_show(struct seq_file *m, void *data)
                strcat(enabled, "u");
        if (qsd_type_enabled(qsd, GRPQUOTA))
                strcat(enabled, "g");
+       if (qsd_type_enabled(qsd, PRJQUOTA))
+               strncat(enabled, "p", 1);
        if (strlen(enabled) == 0)
                strcat(enabled, "none");
 
@@ -343,6 +353,40 @@ static void qsd_qtype_fini(const struct lu_env *env, struct qsd_instance *qsd,
        EXIT;
 }
 
+static const char *qtype2acct_name(int qtype)
+{
+       static char unknown[24];
+
+       switch (qtype) {
+       case USRQUOTA:
+               return "acct_user";
+       case GRPQUOTA:
+               return "acct_group";
+       case PRJQUOTA:
+               return "acct_project";
+       }
+
+       snprintf(unknown, sizeof(unknown), "acct_unknown_%u", qtype);
+       return unknown;
+}
+
+static const char *qtype2glb_name(int qtype)
+{
+       static char unknown[24];
+
+       switch (qtype) {
+       case USRQUOTA:
+               return "limit_user";
+       case GRPQUOTA:
+               return "limit_group";
+       case PRJQUOTA:
+               return "limit_project";
+       }
+
+       snprintf(unknown, sizeof(unknown), "acct_unknown_%u", qtype);
+       return unknown;
+}
+
 /*
  * Allocate and initialize a qsd_qtype_info structure for quota type \qtype.
  * This opens the accounting object and initializes the proc file.
@@ -378,8 +422,6 @@ static int qsd_qtype_init(const struct lu_env *env, struct qsd_instance *qsd,
        qqi->qqi_qsd   = qsd;
        qqi->qqi_qtype = qtype;
        lu_ref_init(&qqi->qqi_reference);
-       lquota_generate_fid(&qqi->qqi_fid, qsd->qsd_pool_id, QSD_RES_TYPE(qsd),
-                           qtype);
        qqi->qqi_glb_uptodate = false;
        qqi->qqi_slv_uptodate = false;
        qqi->qqi_reint        = false;
@@ -387,16 +429,18 @@ static int qsd_qtype_init(const struct lu_env *env, struct qsd_instance *qsd,
        thread_set_flags(&qqi->qqi_reint_thread, SVC_STOPPED);
        INIT_LIST_HEAD(&qqi->qqi_deferred_glb);
        INIT_LIST_HEAD(&qqi->qqi_deferred_slv);
+       lquota_generate_fid(&qqi->qqi_fid, qsd->qsd_pool_id,
+                           QSD_RES_TYPE(qsd), qtype);
 
        /* open accounting object */
        LASSERT(qqi->qqi_acct_obj == NULL);
        qqi->qqi_acct_obj = acct_obj_lookup(env, qsd->qsd_dev, qtype);
        if (IS_ERR(qqi->qqi_acct_obj)) {
-               CDEBUG(D_QUOTA, "%s: no %s space accounting support rc:%ld\n",
-                      qsd->qsd_svname, QTYPE_NAME(qtype),
+               CDEBUG(D_QUOTA, "%s: no %s space accounting support: rc = %ld\n",
+                      qsd->qsd_svname, qtype_name(qtype),
                       PTR_ERR(qqi->qqi_acct_obj));
                qqi->qqi_acct_obj = NULL;
-               qsd->qsd_acct_failed = true;
+               qqi->qqi_acct_failed = true;
        }
 
        /* open global index copy */
@@ -436,8 +480,7 @@ static int qsd_qtype_init(const struct lu_env *env, struct qsd_instance *qsd,
        }
 
        /* register proc entry for accounting & global index copy objects */
-       rc = lprocfs_seq_create(qsd->qsd_proc,
-                               qtype == USRQUOTA ? "acct_user" : "acct_group",
+       rc = lprocfs_seq_create(qsd->qsd_proc, qtype2acct_name(qtype),
                                0444, &lprocfs_quota_seq_fops,
                                qqi->qqi_acct_obj);
        if (rc) {
@@ -446,8 +489,7 @@ static int qsd_qtype_init(const struct lu_env *env, struct qsd_instance *qsd,
                GOTO(out, rc);
        }
 
-       rc = lprocfs_seq_create(qsd->qsd_proc,
-                               qtype == USRQUOTA ? "limit_user" : "limit_group",
+       rc = lprocfs_seq_create(qsd->qsd_proc, qtype2glb_name(qtype),
                                0444, &lprocfs_quota_seq_fops,
                                qqi->qqi_glb_obj);
        if (rc) {
@@ -508,11 +550,9 @@ void qsd_fini(const struct lu_env *env, struct qsd_instance *qsd)
        for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++)
                qsd_qtype_fini(env, qsd, qtype);
 
-       if (qsd->qsd_exp) {
-               /* deregister connection to the quota master */
-               qsd->qsd_exp_valid = false;
-               lustre_deregister_lwp_item(&qsd->qsd_exp);
-       }
+       /* deregister connection to the quota master */
+       qsd->qsd_exp_valid = false;
+       lustre_deregister_lwp_item(&qsd->qsd_exp);
 
        /* release per-filesystem information */
        if (qsd->qsd_fsinfo != NULL) {
@@ -712,7 +752,8 @@ int qsd_prepare(const struct lu_env *env, struct qsd_instance *qsd)
        for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) {
                struct qsd_qtype_info   *qqi = qsd->qsd_type_array[qtype];
 
-               if (qsd_type_enabled(qsd, qtype) && qsd->qsd_acct_failed) {
+               if (qsd_type_enabled(qsd, qtype) &&
+                   qqi->qqi_acct_failed) {
                        LCONSOLE_ERROR("%s: can't enable quota enforcement "
                                       "since space accounting isn't functional"
                                       ". Please run tunefs.lustre --quota on "
@@ -723,9 +764,8 @@ int qsd_prepare(const struct lu_env *env, struct qsd_instance *qsd)
 
                rc = qsd_start_reint_thread(qqi);
                if (rc) {
-                       CERROR("%s: failed to start reint thread for type %s "
-                              "(%d)\n", qsd->qsd_svname, QTYPE_NAME(qtype),
-                              rc);
+                       CERROR("%s: failed to start reint thread for type %s: rc = %d\n",
+                               qsd->qsd_svname, qtype_name(qtype), rc);
                        RETURN(rc);
                }
        }