- new request structure stuff works

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index 3a64421..d59dfa6 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -132,7 +132,7 @@ struct ptlrpc_request *ptlrpc_prep_req(struct ptlrpc_client *cl,
                return NULL;
        }
        request->rq_reqhdr->opc = opcode;
-       request->rq_reqhdr->seqno = request->rq_xid;
+       request->rq_reqhdr->xid = request->rq_xid;
 
        EXIT;
        return request;
@@ -207,7 +207,7 @@ int ptlrpc_queue_wait(struct ptlrpc_client *cl, struct ptlrpc_request *req)
                CERROR("unpack_rep failed: %d\n", rc);
                return rc;
        }
-        CERROR("got rep %lld\n", req->rq_rephdr->seqno);
+        CERROR("got rep %d\n", req->rq_rephdr->xid);
 
        if ( req->rq_rephdr->status == 0 )
                 CDEBUG(0, "--> buf %p len %d status %d\n",

diff --git a/lustre/ptlrpc/niobuf.c b/lustre/ptlrpc/niobuf.c
index debc382..69c5a96 100644 (file)
--- a/lustre/ptlrpc/niobuf.c
+++ b/lustre/ptlrpc/niobuf.c
@@ -137,7 +137,7 @@ int ptlrpc_error(struct obd_device *obddev, struct ptlrpc_service *svc,
 
        memset(hdr, 0, sizeof(*hdr));
        
-       hdr->seqno = req->rq_reqhdr->seqno;
+       hdr->xid = req->rq_reqhdr->xid;
        hdr->status = req->rq_status; 
        hdr->type = OST_TYPE_ERR;
 

diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index 7088d00..3767eda 100644 (file)
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -171,6 +171,7 @@ static int ptlrpc_main(void *arg)
                          * we should put the request on the stack of
                          * mds_handle instead. */
                         memset(&request, 0, sizeof(request));
+                        request.rq_obd = obddev;
                         request.rq_reqbuf = svc->srv_ev.mem_desc.start + svc->srv_ev.offset;
                         request.rq_reqlen = svc->srv_ev.mem_desc.length;
                         request.rq_xid = svc->srv_ev.match_bits;