From 152ec0a60629789b018599e74ba7116a386f385c Mon Sep 17 00:00:00 2001
From: ericm <ericm>
Date: Wed, 30 Apr 2008 17:18:03 +0000
Subject: [PATCH] branch: b1_6 set msghdr flags right before rpc sent out.
b=15487 r=rread r=shadow
---
lustre/ptlrpc/client.c | 1 -
lustre/ptlrpc/niobuf.c | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index b7b22eca7d..bca2b1b93c 100644
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -547,7 +547,6 @@ ptlrpc_prep_req_pool(struct obd_import *imp, __u32 version, int opcode,
atomic_set(&request->rq_refcount, 1);
lustre_msg_set_opc(request->rq_reqmsg, opcode);
- lustre_msghdr_set_flags(request->rq_reqmsg, imp->imp_msghdr_flags);
RETURN(request);
}
diff --git a/lustre/ptlrpc/niobuf.c b/lustre/ptlrpc/niobuf.c
index d8960d22c6..f0e86c07e8 100644
--- a/lustre/ptlrpc/niobuf.c
+++ b/lustre/ptlrpc/niobuf.c
@@ -474,6 +474,8 @@ int ptl_send_rpc(struct ptlrpc_request *request, int noreply)
lustre_msg_set_type(request->rq_reqmsg, PTL_RPC_MSG_REQUEST);
lustre_msg_set_conn_cnt(request->rq_reqmsg,
request->rq_import->imp_conn_cnt);
+ lustre_msghdr_set_flags(request->rq_reqmsg,
+ request->rq_import->imp_msghdr_flags);
if (!noreply) {
LASSERT (request->rq_replen != 0);
--
GitLab