Branch HEAD

b=20929
i=tappro
i=rread

dequeue req if needed on error

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index cb57a86..0fdcb05 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -1654,9 +1654,10 @@ static int handle_recovery_req(struct ptlrpc_thread *thread,
                 spin_lock_bh(&req->rq_export->exp_obd->obd_processing_task_lock);
                 req->rq_export->exp_obd->obd_next_recovery_transno++;
                 spin_unlock_bh(&req->rq_export->exp_obd->obd_processing_task_lock);
-                target_exp_dequeue_req_replay(req);
         }
 reqcopy_put:
+        if (req->rq_export->exp_req_replay_needed)
+                target_exp_dequeue_req_replay(req);
         target_request_copy_put(req);
         RETURN(0);
 }