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 cc2bd32..f4c37e6 100644 (file)
--- a/lustre/quota/qsd_lib.c
+++ b/lustre/quota/qsd_lib.c
@@ -355,6 +355,8 @@ static void qsd_qtype_fini(const struct lu_env *env, struct qsd_instance *qsd,
 
 static const char *qtype2acct_name(int qtype)
 {
+       static char unknown[24];
+
        switch (qtype) {
        case USRQUOTA:
                return "acct_user";
@@ -364,12 +366,14 @@ static const char *qtype2acct_name(int qtype)
                return "acct_project";
        }
 
-       LASSERTF(0, "invalid quota type: %d", qtype);
-       return NULL;
+       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";
@@ -379,8 +383,8 @@ static const char *qtype2glb_name(int qtype)
                return "limit_project";
        }
 
-       LASSERTF(0, "invalid quota type: %d", qtype);
-       return NULL;
+       snprintf(unknown, sizeof(unknown), "acct_unknown_%u", qtype);
+       return unknown;
 }
 
 /*
@@ -546,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) {