From 22bb90df43803a9f7fc8e3bef601e6a94fe04c75 Mon Sep 17 00:00:00 2001 From: yangsheng <yangsheng> Date: Tue, 14 Oct 2008 05:18:14 +0000 Subject: [PATCH] Branch b1_6 b=17335 i=nathan, yangsheng Author: johann Don't set cld_lostlock in mgc_requeue_add() if RQ_STOP. --- lustre/mgc/mgc_request.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c index d6c15c7778..63bdd9ae67 100644 --- a/lustre/mgc/mgc_request.c +++ b/lustre/mgc/mgc_request.c @@ -336,10 +336,9 @@ static int mgc_requeue_add(struct config_llog_data *cld, int later) CDEBUG(D_INFO, "log %s: requeue (l=%d r=%d sp=%d st=%x)\n", cld->cld_logname, later, atomic_read(&cld->cld_refcount), cld->cld_stopping, rq_state); - + /* Hold lock for rq_state */ spin_lock(&config_list_lock); - cld->cld_lostlock = 1; if (cld->cld_stopping || (rq_state & RQ_STOP)) { spin_unlock(&config_list_lock); @@ -347,6 +346,8 @@ static int mgc_requeue_add(struct config_llog_data *cld, int later) RETURN(0); } + cld->cld_lostlock = 1; + if (!(rq_state & RQ_RUNNING)) { LASSERT(rq_state == 0); rq_state = RQ_RUNNING | (later ? RQ_LATER : RQ_NOW); -- GitLab