Whamcloud - gitweb
Remove no-longer-needed inode operations (they previously had extN EA VFS
[fs/lustre-release.git] / lustre / ptlrpc / rpc.c
index 3fdc05c..1ea5145 100644 (file)
  */
 
 #define EXPORT_SYMTAB
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-
 #define DEBUG_SUBSYSTEM S_RPC
 
-#include <linux/obd_support.h>
-#include <linux/lustre_net.h>
-
-static ptl_handle_eq_t sent_pkt_eq, rcvd_rep_eq, 
-        bulk_source_eq, bulk_sink_eq;
-
-
-struct ptlrpc_request *ptlrpc_prep_req(struct ptlrpc_client *cl, 
-                                       int opcode, int namelen, char *name,
-                                       int tgtlen, char *tgt)
-{
-       struct ptlrpc_request *request;
-       int rc;
-       ENTRY; 
-
-       OBD_ALLOC(request, sizeof(*request));
-       if (!request) { 
-               CERROR("request allocation out of memory\n");
-               return NULL;
-       }
-
-       memset(request, 0, sizeof(*request));
-       request->rq_xid = cl->cli_xid++;
-
-       rc = cl->cli_req_pack(name, namelen, tgt, tgtlen,
-                         &request->rq_reqhdr, &request->rq_req,
-                         &request->rq_reqlen, &request->rq_reqbuf);
-       if (rc) { 
-               CERROR("cannot pack request %d\n", rc); 
-               return NULL;
-       }
-       request->rq_reqhdr->opc = opcode;
-
-       EXIT;
-       return request;
-}
-
-void ptlrpc_free_req(struct ptlrpc_request *request)
-{
-       OBD_FREE(request, sizeof(*request));
-}
-
-int ptlrpc_queue_wait(struct ptlrpc_request *req, 
-                             struct ptlrpc_client *cl)
-{
-       int rc;
-        DECLARE_WAITQUEUE(wait, current);
-
-       init_waitqueue_head(&req->rq_wait_for_rep);
-
-       if (cl->cli_enqueue) {
-               /* Local delivery */
-                ENTRY;
-               rc = cl->cli_enqueue(req); 
-       } else {
-               /* Remote delivery via portals. */
-               req->rq_req_portal = cl->cli_request_portal;
-               req->rq_reply_portal = cl->cli_reply_portal;
-               rc = ptl_send_rpc(req, &cl->cli_server);
-       }
-       if (rc) { 
-               CERROR("error %d, opcode %d\n", rc, 
-                      req->rq_reqhdr->opc); 
-               return -rc;
-       }
-
-        CDEBUG(0, "-- sleeping\n");
-        add_wait_queue(&req->rq_wait_for_rep, &wait);
-        while (req->rq_repbuf == NULL) {
-                set_current_state(TASK_INTERRUPTIBLE);
-
-                /* if this process really wants to die, let it go */
-                if (sigismember(&(current->pending.signal), SIGKILL) ||
-                    sigismember(&(current->pending.signal), SIGINT))
-                        break;
-
-                schedule();
-        }
-        remove_wait_queue(&req->rq_wait_for_rep, &wait);
-        set_current_state(TASK_RUNNING);
-        CDEBUG(0, "-- done\n");
-
-        if (req->rq_repbuf == NULL) {
-                /* We broke out because of a signal */
-                EXIT;
-                return -EINTR;
-        }
-
-       rc = cl->cli_rep_unpack(req->rq_repbuf, req->rq_replen, &req->rq_rephdr, &req->rq_rep);
-       if (rc) {
-               CERROR("unpack_rep failed: %d\n", rc);
-               return rc;
-       }
+#include <linux/module.h>
+#include <linux/lustre_ha.h>
 
-       if ( req->rq_rephdr->status == 0 )
-                CDEBUG(0, "--> buf %p len %d status %d\n",
-                      req->rq_repbuf, req->rq_replen, 
-                      req->rq_rephdr->status); 
+extern int ptlrpc_init_portals(void);
+extern void ptlrpc_exit_portals(void);
 
-       EXIT;
-       return 0;
-}
-/*
- *  Free the packet when it has gone out
- */
-static int sent_packet_callback(ptl_event_t *ev, void *data)
+int connmgr_setup(struct obd_device *obddev, obd_count len, void *buf)
 {
+        struct recovd_obd *recovd = &obddev->u.recovd;
+        int err;
         ENTRY;
 
-        if (ev->type == PTL_EVENT_SENT) {
-                OBD_FREE(ev->mem_desc.start, ev->mem_desc.length);
-        } else { 
-                // XXX make sure we understand all events, including ACK's
-                CERROR("Unknown event %d\n", ev->type); 
-                BUG();
-        }
+        memset(recovd, 0, sizeof(*recovd));
 
-        EXIT;
-        return 1;
-}
+        OBD_ALLOC(recovd->recovd_client, sizeof(*recovd->recovd_client));
+        if (!recovd)
+                RETURN(-ENOMEM);
 
-/*
- * Wake up the thread waiting for the reply once it comes in.
- */
-static int rcvd_reply_callback(ptl_event_t *ev, void *data)
-{
-        struct ptlrpc_request *rpc = ev->mem_desc.user_ptr;
-        ENTRY;
+        err = recovd_setup(recovd);
+        if (err)
+                GOTO(err_free, err);
 
-        if (ev->type == PTL_EVENT_PUT) {
-                rpc->rq_repbuf = ev->mem_desc.start + ev->offset;
-                wake_up_interruptible(&rpc->rq_wait_for_rep);
-        } else { 
-                // XXX make sure we understand all events, including ACK's
-                CERROR("Unknown event %d\n", ev->type); 
-                BUG();
+        recovd->recovd_service =
+                ptlrpc_init_svc(128 * 1024,CONNMGR_REQUEST_PORTAL,
+                                CONNMGR_REPLY_PORTAL, "self", connmgr_handle);
+        if (!recovd->recovd_service) {
+                CERROR("failed to start service\n");
+                GOTO(err_recovd, err = -EINVAL);
         }
 
-        EXIT;
-        return 1;
-}
-
-static int server_request_callback(ptl_event_t *ev, void *data)
-{
-        struct ptlrpc_service *service = data;
-        int rc;
-
-        if (ev->rlength != ev->mlength)
-                CERROR("Warning: Possibly truncated rpc (%d/%d)\n",
-                       ev->mlength, ev->rlength);
-
-        /* The ME is unlinked when there is less than 1024 bytes free
-         * on its MD.  This ensures we are always able to handle the rpc, 
-         * although the 1024 value is a guess as to the size of a
-         * large rpc (the known safe margin should be determined).
-         *
-         * NOTE: The portals API by default unlinks all MD's associated
-         *       with an ME when it's unlinked.  For now, this behavior
-         *       has been commented out of the portals library so the
-         *       MD can be unlinked when its ref count drops to zero.
-         *       A new MD and ME will then be created that use the same
-         *       kmalloc()'ed memory and inserted at the ring tail.
-         */
-
-        service->srv_ref_count[service->srv_md_active]++;
-
-        if (ev->offset >= (service->srv_buf_size - 1024)) {
-                CDEBUG(D_INODE, "Unlinking ME %d\n", service->srv_me_active);
-
-                rc = PtlMEUnlink(service->srv_me_h[service->srv_me_active]);
-                service->srv_me_h[service->srv_me_active] = 0;
-
-                if (rc != PTL_OK) {
-                        CERROR("PtlMEUnlink failed - DROPPING soon: %d\n", rc);
-                        return rc;
-                }
+        ptlrpc_init_client(NULL, NULL, CONNMGR_REQUEST_PORTAL, 
+                           CONNMGR_REPLY_PORTAL, recovd->recovd_client);
+        recovd->recovd_client->cli_name = "connmgr"; 
 
-                service->srv_me_active = NEXT_INDEX(service->srv_me_active,
-                        service->srv_ring_length);
-
-                if (service->srv_me_h[service->srv_me_active] == 0)
-                        CERROR("All %d ring ME's are unlinked!\n",
-                               service->srv_ring_length);
-        }
-
-        if (ev->type == PTL_EVENT_PUT) {
-                wake_up(service->srv_wait_queue);
-        } else {
-                CERROR("Unexpected event type: %d\n", ev->type);
+        err = ptlrpc_start_thread(obddev, recovd->recovd_service, "lustre_connmgr");
+        if (err) {
+                CERROR("cannot start thread\n");
+                GOTO(err_svc, err);
         }
 
-        return 0;
-}
-
-static int bulk_source_callback(ptl_event_t *ev, void *data)
-{
-        struct ptlrpc_request *rpc = ev->mem_desc.user_ptr;
-
-        ENTRY;
-
-        if (ev->type == PTL_EVENT_SENT) {
-                CDEBUG(D_NET, "got SENT event\n");
-        } else if (ev->type == PTL_EVENT_ACK) {
-                CDEBUG(D_NET, "got ACK event\n");
-                wake_up_interruptible(&rpc->rq_wait_for_bulk);
-        } else {
-                CERROR("Unexpected event type!\n");
-                BUG();
-        }
+        MOD_INC_USE_COUNT;
+        ptlrpc_connmgr = recovd;
+        RETURN(0);
 
-        EXIT;
-        return 1;
+ err_svc: 
+        rpc_unregister_service(recovd->recovd_service);
+ err_recovd: 
+        recovd_cleanup(recovd); 
+ err_free:
+        if (recovd->recovd_client)
+                OBD_FREE(recovd->recovd_client, sizeof(*recovd->recovd_client));
+        RETURN(err);
 }
 
-static int bulk_sink_callback(ptl_event_t *ev, void *data)
+int connmgr_cleanup(struct obd_device *dev)
 {
-        struct ptlrpc_request *rpc = ev->mem_desc.user_ptr;
+        struct recovd_obd *recovd = &dev->u.recovd;
+        int err;
 
-        ENTRY;
+        err = recovd_cleanup(recovd); 
+        if (err) 
+                LBUG();
 
-        if (ev->type == PTL_EVENT_PUT) {
-                if (rpc->rq_bulkbuf != ev->mem_desc.start + ev->offset)
-                        CERROR("bulkbuf != mem_desc -- why?\n");
-                wake_up_interruptible(&rpc->rq_wait_for_bulk);
-        } else {
-                CERROR("Unexpected event type!\n");
-                BUG();
+        ptlrpc_stop_all_threads(recovd->recovd_service);
+        rpc_unregister_service(recovd->recovd_service);
+        if (!list_empty(&recovd->recovd_service->srv_reqs)) {
+                // XXX reply with errors and clean up
+                CERROR("Request list not empty!\n");
         }
 
-        EXIT;
-        return 1;
+        OBD_FREE(recovd->recovd_service, sizeof(*recovd->recovd_service));
+        ptlrpc_cleanup_client(recovd->recovd_client);
+        OBD_FREE(recovd->recovd_client, sizeof(*recovd->recovd_client));
+        MOD_DEC_USE_COUNT;
+        RETURN(0);
 }
 
-int ptl_send_buf(struct ptlrpc_request *request, struct lustre_peer *peer,
-                 int portal, int is_request)
-{
-        int rc;
-        ptl_process_id_t remote_id;
-        ptl_handle_md_t md_h;
-
-        /* FIXME: This is bad. */
-        if (request->rq_bulklen) {
-                request->rq_req_md.start = request->rq_bulkbuf;
-                request->rq_req_md.length = request->rq_bulklen;
-                request->rq_req_md.eventq = bulk_source_eq;
-        } else if (is_request) {
-                request->rq_req_md.start = request->rq_reqbuf;
-                request->rq_req_md.length = request->rq_reqlen;
-                request->rq_req_md.eventq = sent_pkt_eq;
-        } else {
-                request->rq_req_md.start = request->rq_repbuf;
-                request->rq_req_md.length = request->rq_replen;
-                request->rq_req_md.eventq = sent_pkt_eq;
-        }
-        request->rq_req_md.threshold = 1;
-        request->rq_req_md.options = PTL_MD_OP_PUT;
-        request->rq_req_md.user_ptr = request;
-
-        rc = PtlMDBind(peer->peer_ni, request->rq_req_md, &md_h);
-        if (rc != 0) {
-                BUG();
-                CERROR("PtlMDBind failed: %d\n", rc);
-                return rc;
-        }
 
-        remote_id.addr_kind = PTL_ADDR_NID;
-        remote_id.nid = peer->peer_nid;
-        remote_id.pid = 0;
-
-        if (request->rq_bulklen) {
-                rc = PtlPut(md_h, PTL_ACK_REQ, remote_id, portal, 0,
-                            request->rq_xid, 0, 0);
-        } else {
-                rc = PtlPut(md_h, PTL_NOACK_REQ, remote_id, portal, 0,
-                            request->rq_xid, 0, 0);
-        }
-        if (rc != PTL_OK) {
-                BUG();
-                CERROR("PtlPut(%d, %d, %d) failed: %d\n", remote_id.nid,
-                       portal, request->rq_xid, rc);
-                /* FIXME: tear down md */
-        }
-
-        return rc;
-}
-
-int ptl_send_rpc(struct ptlrpc_request *request, struct lustre_peer *peer)
+int connmgr_iocontrol(long cmd, struct obd_conn *conn, int len, void *karg,
+                      void *uarg)
 {
-        ptl_handle_me_t me_h, bulk_me_h;
-        ptl_process_id_t local_id;
-        int rc;
-        char *repbuf;
+        struct recovd_obd *recovd = &conn->oc_dev->u.recovd;
 
         ENTRY;
-
-        if (request->rq_replen == 0) {
-                CERROR("request->rq_replen is 0!\n");
-                EXIT;
-                return -EINVAL;
-        }
-
-        /* request->rq_repbuf is set only when the reply comes in, in
-         * client_packet_callback() */
-        OBD_ALLOC(repbuf, request->rq_replen);
-        if (!repbuf) { 
-                EXIT;
-                return -ENOMEM;
-        }
-
-        local_id.addr_kind = PTL_ADDR_GID;
-        local_id.gid = PTL_ID_ANY;
-        local_id.rid = PTL_ID_ANY;
-
-        CERROR("sending req %d\n", request->rq_xid);
-        rc = PtlMEAttach(peer->peer_ni, request->rq_reply_portal, local_id,
-                         request->rq_xid, 0, PTL_UNLINK, &me_h);
-        if (rc != PTL_OK) {
-                CERROR("PtlMEAttach failed: %d\n", rc);
-                BUG();
-                EXIT;
-                goto cleanup;
-        }
-
-        request->rq_reply_md.start = repbuf;
-        request->rq_reply_md.length = request->rq_replen;
-        request->rq_reply_md.threshold = 1;
-        request->rq_reply_md.options = PTL_MD_OP_PUT;
-        request->rq_reply_md.user_ptr = request;
-        request->rq_reply_md.eventq = rcvd_rep_eq;
-
-        rc = PtlMDAttach(me_h, request->rq_reply_md, PTL_UNLINK,
-                         &request->rq_reply_md_h);
-        if (rc != PTL_OK) {
-                CERROR("PtlMDAttach failed: %d\n", rc);
-                BUG();
+        if (cmd == OBD_RECOVD_NEWCONN) { 
+                spin_lock(&recovd->recovd_lock);
+                recovd->recovd_flags |= RECOVD_UPCALL_ANSWER;
+                recovd->recovd_wakeup_flag = 1;
+                wake_up(&recovd->recovd_waitq);
+                spin_unlock(&recovd->recovd_lock);
                 EXIT;
-                goto cleanup2;
-        }
-
-        if (request->rq_bulklen != 0) {
-                rc = PtlMEAttach(peer->peer_ni, request->rq_bulk_portal,
-                                 local_id, request->rq_xid, 0, PTL_UNLINK,
-                                 &bulk_me_h);
-                if (rc != PTL_OK) {
-                        CERROR("PtlMEAttach failed: %d\n", rc);
-                        BUG();
-                        EXIT;
-                        goto cleanup3;
-                }
-
-                request->rq_bulk_md.start = request->rq_bulkbuf;
-                request->rq_bulk_md.length = request->rq_bulklen;
-                request->rq_bulk_md.threshold = 1;
-                request->rq_bulk_md.options = PTL_MD_OP_PUT;
-                request->rq_bulk_md.user_ptr = request;
-                request->rq_bulk_md.eventq = bulk_sink_eq;
-
-                rc = PtlMDAttach(bulk_me_h, request->rq_bulk_md, PTL_UNLINK,
-                                 &request->rq_bulk_md_h);
-                if (rc != PTL_OK) {
-                        CERROR("PtlMDAttach failed: %d\n", rc);
-                        BUG();
-                        EXIT;
-                        goto cleanup4;
-                }
         }
-
-        return ptl_send_buf(request, peer, request->rq_req_portal, 1);
-
- cleanup4:
-        PtlMEUnlink(bulk_me_h);
- cleanup3:
-        PtlMDUnlink(request->rq_reply_md_h);
- cleanup2:
-        PtlMEUnlink(me_h);
- cleanup:
-        OBD_FREE(repbuf, request->rq_replen);
-
-        return rc;
-}
-
-/* ptl_received_rpc() should be called by the sleeping process once
- * it finishes processing an event.  This ensures the ref count is
- * decremented and that the rpc ring buffer cycles properly.
- */ 
-int ptl_received_rpc(struct ptlrpc_service *service) {
-        int rc, index;
-
-        index = service->srv_md_active;
-        CDEBUG(D_INFO, "MD index=%d Ref Count=%d\n", index,
-               service->srv_ref_count[index]);
-        service->srv_ref_count[index]--;
-
-        if ((service->srv_ref_count[index] <= 0) &&
-            (service->srv_me_h[index] == 0)) {
-
-                /* Replace the unlinked ME and MD */
-                rc = PtlMEInsert(service->srv_me_h[service->srv_me_tail],
-                                 service->srv_id, 0, ~0, PTL_RETAIN,
-                                 PTL_INS_AFTER, &(service->srv_me_h[index]));
-                CDEBUG(D_INFO, "Inserting new ME and MD in ring, rc %d\n", rc);
-                service->srv_me_tail = index;
-                service->srv_ref_count[index] = 0;
-                
-                if (rc != PTL_OK) {
-                        CERROR("PtlMEInsert failed: %d\n", rc);
-                        return rc;
-                }
-
-                service->srv_md[index].start        = service->srv_buf[index];
-                service->srv_md[index].length       = service->srv_buf_size;
-                service->srv_md[index].threshold    = PTL_MD_THRESH_INF;
-                service->srv_md[index].options      = PTL_MD_OP_PUT;
-                service->srv_md[index].user_ptr     = service;
-                service->srv_md[index].eventq       = service->srv_eq_h;
-
-                rc = PtlMDAttach(service->srv_me_h[index],
-                                 service->srv_md[index],
-                                 PTL_RETAIN, &(service->srv_md_h[index]));
-
-                CDEBUG(D_INFO, "Attach MD in ring, rc %d\n", rc);
-                if (rc != PTL_OK) {
-                        /* XXX cleanup */
-                        BUG();
-                        CERROR("PtlMDAttach failed: %d\n", rc);
-                        return rc;
-                }
-
-                service->srv_md_active =
-                        NEXT_INDEX(index, service->srv_ring_length);
-        } 
-        
         return 0;
 }
 
-int rpc_register_service(struct ptlrpc_service *service, char *uuid)
-{
-        struct lustre_peer peer;
-        int rc, i;
 
-        rc = kportal_uuid_to_peer(uuid, &peer);
-        if (rc != 0) {
-                CERROR("Invalid uuid \"%s\"\n", uuid);
-                return -EINVAL;
-        }
-
-        service->srv_ring_length = RPC_RING_LENGTH;
-        service->srv_me_active = 0;
-        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;
-
-        rc = PtlEQAlloc(peer.peer_ni, 128, server_request_callback,
-                        service, &(service->srv_eq_h));
-
-        if (rc != PTL_OK) {
-                CERROR("PtlEQAlloc failed: %d\n", rc);
-                return rc;
-        }
-
-        /* Attach the leading ME on which we build the ring */
-        rc = PtlMEAttach(peer.peer_ni, service->srv_portal,
-                         service->srv_id, 0, ~0, PTL_RETAIN,
-                         &(service->srv_me_h[0]));
-
-        if (rc != PTL_OK) {
-                CERROR("PtlMEAttach failed: %d\n", rc);
-                return rc;
-        }
-
-        for (i = 0; i < service->srv_ring_length; i++) {
-                OBD_ALLOC(service->srv_buf[i], service->srv_buf_size);
-
-                if (service->srv_buf[i] == NULL) {
-                        CERROR("no memory\n");
-                        return -ENOMEM;
-                }
-
-                /* Insert additional ME's to the ring */
-                if (i > 0) {
-                        rc = PtlMEInsert(service->srv_me_h[i-1],
-                                         service->srv_id, 0, ~0, PTL_RETAIN,
-                                         PTL_INS_AFTER,&(service->srv_me_h[i]));
-                        service->srv_me_tail = i;
-
-                        if (rc != PTL_OK) {
-                                CERROR("PtlMEInsert failed: %d\n", rc);
-                                return rc;
-                        }
-                }
-
-                service->srv_ref_count[i] = 0;
-                service->srv_md[i].start        = service->srv_buf[i];
-                service->srv_md[i].length        = service->srv_buf_size;
-                service->srv_md[i].threshold        = PTL_MD_THRESH_INF;
-                service->srv_md[i].options        = PTL_MD_OP_PUT;
-                service->srv_md[i].user_ptr        = service;
-                service->srv_md[i].eventq        = service->srv_eq_h;
-
-                rc = PtlMDAttach(service->srv_me_h[i], service->srv_md[i],
-                                 PTL_RETAIN, &(service->srv_md_h[i]));
-
-                if (rc != PTL_OK) {
-                        /* cleanup */
-                        CERROR("PtlMDAttach failed: %d\n", rc);
-                        return rc;
-                }
-        }
-
-        return 0;
-}
-
-int rpc_unregister_service(struct ptlrpc_service *service)
-{
-        int rc, i;
-
-        for (i = 0; i < service->srv_ring_length; i++) {
-                rc = PtlMDUnlink(service->srv_md_h[i]);
-                if (rc)
-                        CERROR("PtlMDUnlink failed: %d\n", rc);
-        
-                rc = PtlMEUnlink(service->srv_me_h[i]);
-                if (rc)
-                        CERROR("PtlMEUnlink failed: %d\n", rc);
-        
-                OBD_FREE(service->srv_buf[i], service->srv_buf_size);                
-        }
-
-        rc = PtlEQFree(service->srv_eq_h);
-        if (rc)
-                CERROR("PtlEQFree failed: %d\n", rc);
-
-        return 0;
-}
-
-static int req_init_portals(void)
-{
-        int rc;
-        const ptl_handle_ni_t *nip;
-        ptl_handle_ni_t ni;
-
-        nip = inter_module_get_request(LUSTRE_NAL "_ni", LUSTRE_NAL);
-        if (nip == NULL) {
-                CERROR("get_ni failed: is the NAL module loaded?\n");
-                return -EIO;
-        }
-        ni = *nip;
-
-        rc = PtlEQAlloc(ni, 128, sent_packet_callback, NULL, &sent_pkt_eq);
-        if (rc != PTL_OK)
-                CERROR("PtlEQAlloc failed: %d\n", rc);
-
-        rc = PtlEQAlloc(ni, 128, rcvd_reply_callback, NULL, &rcvd_rep_eq);
-        if (rc != PTL_OK)
-                CERROR("PtlEQAlloc failed: %d\n", rc);
-
-        rc = PtlEQAlloc(ni, 128, bulk_source_callback, NULL, &bulk_source_eq);
-        if (rc != PTL_OK)
-                CERROR("PtlEQAlloc failed: %d\n", rc);
-
-        rc = PtlEQAlloc(ni, 128, bulk_sink_callback, NULL, &bulk_sink_eq);
-        if (rc != PTL_OK)
-                CERROR("PtlEQAlloc failed: %d\n", rc);
-
-        return rc;
-}
+/* use obd ops to offer management infrastructure */
+static struct obd_ops recovd_obd_ops = {
+        o_setup:       connmgr_setup,
+        o_cleanup:     connmgr_cleanup,
+        o_iocontrol:     connmgr_iocontrol,
+};
 
 static int __init ptlrpc_init(void)
 {
-        return req_init_portals();
+        int rc; 
+        rc = ptlrpc_init_portals();
+        if (rc) 
+                RETURN(rc);
+        ptlrpc_init_connection();
+        obd_register_type(&recovd_obd_ops, LUSTRE_HA_NAME);
+        return 0;
 }
 
 static void __exit ptlrpc_exit(void)
 {
-        PtlEQFree(sent_pkt_eq);
-        PtlEQFree(rcvd_rep_eq);
-        PtlEQFree(bulk_source_eq);
-        PtlEQFree(bulk_sink_eq);
-
-        inter_module_put(LUSTRE_NAL "_ni");
-
-        return;
-}
+        obd_unregister_type(LUSTRE_HA_NAME);
+        ptlrpc_exit_portals();
+        ptlrpc_cleanup_connection();
+}
+
+/* connmgr.c */
+EXPORT_SYMBOL(ptlrpc_connmgr);
+EXPORT_SYMBOL(connmgr_connect);
+EXPORT_SYMBOL(connmgr_handle);
+EXPORT_SYMBOL(recovd_cli_fail);
+EXPORT_SYMBOL(recovd_cli_manage);
+EXPORT_SYMBOL(recovd_cli_fixed);
+EXPORT_SYMBOL(recovd_setup);
+EXPORT_SYMBOL(recovd_cleanup);
+
+/* connection.c */
+EXPORT_SYMBOL(ptlrpc_readdress_connection);
+EXPORT_SYMBOL(ptlrpc_get_connection);
+EXPORT_SYMBOL(ptlrpc_put_connection);
+EXPORT_SYMBOL(ptlrpc_connection_addref);
+EXPORT_SYMBOL(ptlrpc_init_connection);
+EXPORT_SYMBOL(ptlrpc_cleanup_connection);
+
+/* niobuf.c */
+EXPORT_SYMBOL(ptlrpc_send_bulk);
+EXPORT_SYMBOL(ptlrpc_register_bulk);
+EXPORT_SYMBOL(ptlrpc_abort_bulk);
+EXPORT_SYMBOL(ptlrpc_reply);
+EXPORT_SYMBOL(ptlrpc_error);
+EXPORT_SYMBOL(ptlrpc_resend_req);
+EXPORT_SYMBOL(ptl_send_rpc);
+EXPORT_SYMBOL(ptlrpc_link_svc_me);
+
+/* client.c */
+EXPORT_SYMBOL(ptlrpc_init_client);
+EXPORT_SYMBOL(ptlrpc_cleanup_client);
+EXPORT_SYMBOL(ptlrpc_req_to_uuid);
+EXPORT_SYMBOL(ptlrpc_uuid_to_connection);
+EXPORT_SYMBOL(ptlrpc_queue_wait);
+EXPORT_SYMBOL(ptlrpc_continue_req);
+EXPORT_SYMBOL(ptlrpc_replay_req);
+EXPORT_SYMBOL(ptlrpc_restart_req);
+EXPORT_SYMBOL(ptlrpc_prep_req);
+EXPORT_SYMBOL(ptlrpc_free_req);
+EXPORT_SYMBOL(ptlrpc_req_finished);
+EXPORT_SYMBOL(ptlrpc_prep_bulk);
+EXPORT_SYMBOL(ptlrpc_free_bulk);
+EXPORT_SYMBOL(ptlrpc_prep_bulk_page);
+EXPORT_SYMBOL(ptlrpc_free_bulk_page);
+EXPORT_SYMBOL(ptlrpc_check_status);
+
+/* service.c */
+EXPORT_SYMBOL(ptlrpc_init_svc);
+EXPORT_SYMBOL(ptlrpc_stop_all_threads);
+EXPORT_SYMBOL(ptlrpc_start_thread);
+EXPORT_SYMBOL(rpc_unregister_service);
+
+/* pack_generic.c */
+EXPORT_SYMBOL(lustre_pack_msg);
+EXPORT_SYMBOL(lustre_msg_size);
+EXPORT_SYMBOL(lustre_unpack_msg);
+EXPORT_SYMBOL(lustre_msg_buf);
 
 MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>");
 MODULE_DESCRIPTION("Lustre Request Processor v1.0");