Whamcloud - gitweb
LU-9725 quota: always deregister lwp 56/28356/3
authorLai Siyao <lai.siyao@intel.com>
Mon, 7 Aug 2017 20:25:41 +0000 (16:25 -0400)
committerOleg Drokin <oleg.drokin@intel.com>
Sun, 13 Aug 2017 17:17:46 +0000 (17:17 +0000)
qsd should always deregiter lwp upon finish no matter qsd_exp was
set before, otherwise the item will stay on the list, but qsd has
been freed.

Signed-off-by: Lai Siyao <lai.siyao@intel.com>
Change-Id: I0d6206f2f2bc8177d0aa35b350f534d85eab1c03
Reviewed-on: https://review.whamcloud.com/28356
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Niu Yawei <yawei.niu@intel.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/quota/qsd_lib.c

index 5478683..f4c37e6 100644 (file)
@@ -550,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);
 
        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) {
 
        /* release per-filesystem information */
        if (qsd->qsd_fsinfo != NULL) {