From ce8ca7d3564439285a56982430f380354b697f68 Mon Sep 17 00:00:00 2001 From: Lai Siyao Date: Mon, 7 Aug 2017 16:25:41 -0400 Subject: [PATCH] LU-9725 quota: always deregister lwp 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 Change-Id: I0d6206f2f2bc8177d0aa35b350f534d85eab1c03 Reviewed-on: https://review.whamcloud.com/28356 Reviewed-by: James Simmons Reviewed-by: Niu Yawei Reviewed-by: Fan Yong Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/quota/qsd_lib.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lustre/quota/qsd_lib.c b/lustre/quota/qsd_lib.c index 5478683..f4c37e6 100644 --- a/lustre/quota/qsd_lib.c +++ b/lustre/quota/qsd_lib.c @@ -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); - 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) { -- 1.8.3.1