Branch b1_8

b=18946
i=shadow
i=johann

don't cancel locks during replay

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index 34f585a..1fdb72a 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -2253,7 +2253,6 @@ static int ptlrpc_replay_interpret(struct ptlrpc_request *req,
                 DEBUG_REQ(D_WARNING, req, "Version mismatch during replay\n");
                 spin_lock(&imp->imp_lock);
                 imp->imp_vbr_failed = 1;
-                imp->imp_no_lock_replay = 1;
                 spin_unlock(&imp->imp_lock);
         } else {
                 /* The transno had better not change over replay. */
@@ -2263,9 +2262,6 @@ static int ptlrpc_replay_interpret(struct ptlrpc_request *req,
         }
 
         spin_lock(&imp->imp_lock);
-        /* if replays by version then gap was occur on server, no trust to locks */
-        if (lustre_msg_get_flags(req->rq_repmsg) & MSG_VERSION_REPLAY)
-                imp->imp_no_lock_replay = 1;
         imp->imp_last_replay_transno = lustre_msg_get_transno(req->rq_reqmsg);
         spin_unlock(&imp->imp_lock);
         LASSERT(imp->imp_last_replay_transno);