[Lustre-cvs] b_devel: lustre/ldlm ldlm_lockd.c

[Eric B. <ee...@us...>]

Update of /cvsroot/lustre/lustre/ldlm
In directory sc8-pr-cvs1:/tmp/cvs-serv19138/ldlm

Modified Files:
      Tag: b_devel
	ldlm_lockd.c 
Log Message:
*   Removed redundant parameter to ptlrpc_{error,reply}

*   Reply messages set msg->opc to match the request.  Client checks this
    for sanity.  Makes tcpdump tractible and should help in other debug
    situations. 

*   Made mismatched req/rep transnos on replay a protocol error rather than
    LASSERT (it LBUGs for the time being).



Index: ldlm_lockd.c
===================================================================
RCS file: /cvsroot/lustre/lustre/ldlm/ldlm_lockd.c,v
retrieving revision 1.131.2.32
retrieving revision 1.131.2.33
diff -u -w -b -B -p -r1.131.2.32 -r1.131.2.33
--- ldlm_lockd.c	22 May 2003 18:50:46 -0000	1.131.2.32
+++ ldlm_lockd.c	23 May 2003 18:41:08 -0000	1.131.2.33
@@ -566,7 +566,7 @@ int ldlm_handle_cancel(struct ptlrpc_req
                 req->rq_status = 0;
         }
 
-        if (ptlrpc_reply(req->rq_svc, req) != 0)
+        if (ptlrpc_reply(req) != 0)
                 LBUG();
 
         if (lock) {
@@ -674,7 +674,7 @@ static int ldlm_callback_reply(struct pt
                              &req->rq_repmsg);
         if (rc)
                 return rc;
-        return ptlrpc_reply(req->rq_svc, req);
+        return ptlrpc_reply(req);
 }
 
 static int ldlm_callback_handler(struct ptlrpc_request *req)