Branch HEAD

b=17335
i=nathan, yangsheng
Author: johann

Don't set cld_lostlock in mgc_requeue_add() if RQ_STOP.

diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c
index e385931..9985007 100644 (file)
--- a/lustre/mgc/mgc_request.c
+++ b/lustre/mgc/mgc_request.c
@@ -337,7 +337,6 @@ static int mgc_requeue_add(struct config_llog_data *cld, int later)
 
         /* Hold lock for rq_state */
         spin_lock(&config_list_lock);
 
         /* 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);
 
         if (cld->cld_stopping || (rq_state & RQ_STOP)) {
                 spin_unlock(&config_list_lock);


@@ -345,6 +344,8 @@ static int mgc_requeue_add(struct config_llog_data *cld, int later)
                 RETURN(0);
         }
 
                 RETURN(0);
         }
 

+        cld->cld_lostlock = 1;
+

         if (!(rq_state & RQ_RUNNING)) {
                 LASSERT(rq_state == 0);
                 rq_state = RQ_RUNNING | (later ? RQ_LATER : RQ_NOW);
         if (!(rq_state & RQ_RUNNING)) {
                 LASSERT(rq_state == 0);
                 rq_state = RQ_RUNNING | (later ? RQ_LATER : RQ_NOW);