Branch HEAD

[fs/lustre-release.git] / lustre / ptlrpc / import.c

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index fad264b..e6cde5c 100644 (file)
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -806,8 +806,7 @@ static int ptlrpc_connect_interpret(const struct lu_env *env,
         if (rc) {
                 /* if this reconnect to busy export - not need select new target
                  * for connecting*/
-                if (ptlrpc_busy_reconnect(rc))
-                        imp->imp_force_reconnect = 1;
+                imp->imp_force_reconnect = ptlrpc_busy_reconnect(rc);
                 spin_unlock(&imp->imp_lock);
                 GOTO(out, rc);
         }
@@ -1227,7 +1226,8 @@ static int signal_completed_replay(struct obd_import *imp)
         req->rq_send_state = LUSTRE_IMP_REPLAY_WAIT;
         lustre_msg_add_flags(req->rq_reqmsg,
                              MSG_LOCK_REPLAY_DONE | MSG_REQ_REPLAY_DONE);
-        req->rq_timeout *= 3;
+        if (AT_OFF)
+                req->rq_timeout *= 3;
         req->rq_interpret_reply = completed_replay_interpret;
 
         ptlrpcd_add_req(req, PSCOPE_OTHER);