remove gid/rid's; minor cleanups.

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 50d0a77..3bc9b1d 100644 (file)
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -97,25 +97,25 @@ static int ldlm_handle(struct obd_device *dev, struct ptlrpc_service *svc,
         switch (req->rq_reqhdr->opc) {
         case LDLM_ENQUEUE:
                 CDEBUG(D_INODE, "enqueue\n");
-                OBD_FAIL_RETURN(req, OBD_FAIL_LDLM_ENQUEUE);
+                OBD_FAIL_RETURN(OBD_FAIL_LDLM_ENQUEUE, 0);
                 rc = ldlm_enqueue(req);
                 break;
 #if 0
         case LDLM_CONVERT:
                 CDEBUG(D_INODE, "convert\n");
-                OBD_FAIL_RETURN(req, OBD_FAIL_LDLM_CONVERT);
+                OBD_FAIL_RETURN(OBD_FAIL_LDLM_CONVERT, 0);
                 rc = ldlm_convert(req);
                 break;
 
         case LDLM_CANCEL:
                 CDEBUG(D_INODE, "cancel\n");
-                OBD_FAIL_RETURN(req, OBD_FAIL_LDLM_CANCEL);
+                OBD_FAIL_RETURN(OBD_FAIL_LDLM_CANCEL, 0);
                 rc = ldlm_cancel(req);
                 break;
 
         case LDLM_CALLBACK:
                 CDEBUG(D_INODE, "callback\n");
-                OBD_FAIL_RETURN(req, OBD_FAIL_LDLM_CALLBACK);
+                OBD_FAIL_RETURN(OBD_FAIL_LDLM_CALLBACK, 0);
                 rc = ldlm_callback(req);
                 break;
 #endif

diff --git a/lustre/ptlrpc/events.c b/lustre/ptlrpc/events.c
index f1d0e13..d07acd7 100644 (file)
--- a/lustre/ptlrpc/events.c
+++ b/lustre/ptlrpc/events.c
@@ -40,12 +40,8 @@ static const ptl_handle_ni_t *socknal_nip = NULL, *qswnal_nip = NULL;
  */
 static int sent_packet_callback(ptl_event_t *ev, void *data)
 {
-        ptl_event_t junk_ev;
-
         ENTRY;
 
-        PtlEQGet(sent_pkt_eq, &junk_ev);
-
         if (ev->type == PTL_EVENT_SENT) {
                 OBD_FREE(ev->mem_desc.start, ev->mem_desc.length);
         } else { 

diff --git a/lustre/ptlrpc/niobuf.c b/lustre/ptlrpc/niobuf.c
index 105fe22..10dd72d 100644 (file)
--- a/lustre/ptlrpc/niobuf.c
+++ b/lustre/ptlrpc/niobuf.c
@@ -33,7 +33,7 @@
 #include <linux/lustre_net.h>
 
 extern ptl_handle_eq_t bulk_source_eq, sent_pkt_eq, rcvd_rep_eq, bulk_sink_eq;
-static ptl_process_id_t local_id = {PTL_ADDR_GID, PTL_ID_ANY, PTL_ID_ANY};
+static ptl_process_id_t local_id = {PTL_ID_ANY, PTL_ID_ANY};
 
 
 int ptlrpc_check_bulk_sent(struct ptlrpc_bulk_desc *bulk)
@@ -99,7 +99,6 @@ int ptl_send_buf(struct ptlrpc_request *request, struct lustre_peer *peer,
                 return rc;
         }
 
-        remote_id.addr_kind = PTL_ADDR_NID;
         remote_id.nid = peer->peer_nid;
         remote_id.pid = 0;
 
@@ -136,7 +135,6 @@ int ptlrpc_send_bulk(struct ptlrpc_bulk_desc *bulk, int portal)
                 return rc;
         }
 
-        remote_id.addr_kind = PTL_ADDR_NID;
         remote_id.nid = bulk->b_peer.peer_nid;
         remote_id.pid = 0;
 
@@ -291,9 +289,8 @@ int ptl_send_rpc(struct ptlrpc_request *request, struct lustre_peer *peer)
                 return -ENOMEM;
         }
 
-        local_id.addr_kind = PTL_ADDR_GID;
-        local_id.gid = PTL_ID_ANY;
-        local_id.rid = PTL_ID_ANY;
+        local_id.nid = PTL_ID_ANY;
+        local_id.pid = PTL_ID_ANY;
 
         //CERROR("sending req %d\n", request->rq_xid);
         rc = PtlMEPrepend(peer->peer_ni, request->rq_reply_portal, local_id,

diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index 9270490..83538e0 100644 (file)
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -275,9 +275,8 @@ int rpc_register_service(struct ptlrpc_service *service, char *uuid)
         service->srv_ring_length = RPC_RING_LENGTH;
         service->srv_md_active = 0;
 
-        service->srv_id.addr_kind = PTL_ADDR_GID;
-        service->srv_id.gid = PTL_ID_ANY;
-        service->srv_id.rid = PTL_ID_ANY;
+        service->srv_id.nid = PTL_ID_ANY;
+        service->srv_id.pid = PTL_ID_ANY;
 
         rc = PtlEQAlloc(peer.peer_ni, 128, server_request_callback,
                         service, &(service->srv_eq_h));
@@ -308,12 +307,12 @@ int rpc_register_service(struct ptlrpc_service *service, char *uuid)
                         return -ENOMEM;
                 }
 
-
                 /* Insert additional ME's to the ring */
                 if (i > 0) {
-                        rc = PtlMEInsert(service->srv_me_h[i-1],
+                        rc = PtlMEInsert(service->srv_me_h[i - 1],
                                          service->srv_id, 0, ~0, PTL_RETAIN,
-                                         PTL_INS_AFTER,&(service->srv_me_h[i]));
+                                         PTL_INS_AFTER,
+                                         &(service->srv_me_h[i]));
                         service->srv_me_tail = i;
 
                         if (rc != PTL_OK) {

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index e8dd934..efce1ba 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -11,7 +11,7 @@ PORT=1234
 setup
 setup_portals
 
-new_fs ext2 /tmp/ost 250000
+new_fs ext2 /tmp/ost 25000
 OST=$LOOPDEV
 MDSFS=ext2
 new_fs ${MDSFS} /tmp/mds 10000