#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/obd_class.h>
#include <linux/lustre_net.h>
-ptl_handle_eq_t sent_pkt_eq, rcvd_rep_eq, bulk_source_eq, bulk_sink_eq;
+ptl_handle_eq_t request_out_eq,
+ reply_in_eq,
+ reply_out_eq,
+ bulk_source_eq,
+ bulk_sink_eq;
static const ptl_handle_ni_t *socknal_nip = NULL, *qswnal_nip = NULL;
/*
* Free the packet when it has gone out
*/
-static int sent_packet_callback(ptl_event_t *ev, void *data)
+static int request_out_callback(ptl_event_t *ev, void *data)
+{
+ struct ptlrpc_request *req = ev->mem_desc.user_ptr;
+ struct ptlrpc_client *cl = req->rq_client;
+
+ ENTRY;
+
+ if (ev->type == PTL_EVENT_SENT) {
+ spin_lock(&req->rq_client->cli_ha_mgr->mgr_lock);
+ list_del(&req->rq_list);
+ list_add(&req->rq_list, &cl->cli_sent_head);
+ spin_unlock(&req->rq_client->cli_ha_mgr->mgr_lock);
+ } else {
+ // XXX make sure we understand all events, including ACK's
+ CERROR("Unknown event %d\n", ev->type);
+ LBUG();
+ }
+
+ RETURN(1);
+}
+
+
+/*
+ * Free the packet when it has gone out
+ */
+static int reply_out_callback(ptl_event_t *ev, void *data)
{
ENTRY;
/*
* Wake up the thread waiting for the reply once it comes in.
*/
-static int rcvd_reply_callback(ptl_event_t *ev, void *data)
+static int reply_in_callback(ptl_event_t *ev, void *data)
{
struct ptlrpc_request *rpc = ev->mem_desc.user_ptr;
ENTRY;
if (ev->type == PTL_EVENT_PUT) {
- rpc->rq_repbuf = ev->mem_desc.start + ev->offset;
+ rpc->rq_repmsg = ev->mem_desc.start + ev->offset;
barrier();
wake_up_interruptible(&rpc->rq_wait_for_rep);
} else {
RETURN(1);
}
-int server_request_callback(ptl_event_t *ev, void *data)
+int request_in_callback(ptl_event_t *ev, void *data)
{
struct ptlrpc_service *service = data;
int index;
else
ni = *socknal_nip;
- rc = PtlEQAlloc(ni, 128, sent_packet_callback, NULL, &sent_pkt_eq);
+ rc = PtlEQAlloc(ni, 128, request_out_callback, NULL, &request_out_eq);
+ if (rc != PTL_OK)
+ CERROR("PtlEQAlloc failed: %d\n", rc);
+
+ rc = PtlEQAlloc(ni, 128, reply_out_callback, NULL, &reply_out_eq);
if (rc != PTL_OK)
CERROR("PtlEQAlloc failed: %d\n", rc);
- rc = PtlEQAlloc(ni, 128, rcvd_reply_callback, NULL, &rcvd_rep_eq);
+ rc = PtlEQAlloc(ni, 128, reply_in_callback, NULL, &reply_in_eq);
if (rc != PTL_OK)
CERROR("PtlEQAlloc failed: %d\n", rc);
void ptlrpc_exit_portals(void)
{
- PtlEQFree(sent_pkt_eq);
- PtlEQFree(rcvd_rep_eq);
+ PtlEQFree(request_out_eq);
+ PtlEQFree(reply_out_eq);
+ PtlEQFree(reply_in_eq);
PtlEQFree(bulk_source_eq);
PtlEQFree(bulk_sink_eq);