branch: b1_8

properly prepare fake request.
b=20346
r=wangdi
r=fanyong

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index c9dba2f..77333a0 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -628,9 +628,12 @@ struct ptlrpc_request *ptlrpc_prep_fakereq(struct obd_import *imp,
         request->rq_type = PTL_RPC_MSG_REQUEST;
         request->rq_import = class_import_get(imp);
         request->rq_export = NULL;
+        request->rq_import_generation = imp->imp_generation;
 
+        request->rq_timeout = timeout;
         request->rq_sent = cfs_time_current_sec();
-        request->rq_reply_deadline = request->rq_sent + timeout;
+        request->rq_deadline = request->rq_sent + timeout;
+        request->rq_reply_deadline = request->rq_deadline;
         request->rq_interpret_reply = interpreter;
         request->rq_phase = RQ_PHASE_RPC;
         request->rq_next_phase = RQ_PHASE_INTERPRET;