* large request buffers; the request object is dynamically allocated in

    the event handler (request_in_callback()) for all incoming request
    messages apart from the one that fills a request buffer

*   CAVEAT EMPTOR so far this has only been tested with echo client/server,
    which doesn't test all types of reply (viz "difficult" replies).

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 67d2dc2..b3120db 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -826,7 +826,7 @@ target_send_reply(struct ptlrpc_request *req, int rc, int fail_id)
         struct ptlrpc_srv_ni      *sni;
         struct ptlrpc_service     *svc;
 
-        sni = req->rq_srv_ni;
+        sni = req->rq_rqbd->rqbd_srv_ni;
         svc = sni->sni_service;
         
         rs = req->rq_reply_state;

diff --git a/lustre/mgmt/mgmt_svc.c b/lustre/mgmt/mgmt_svc.c
index c638dfa..5a35760 100644 (file)
--- a/lustre/mgmt/mgmt_svc.c
+++ b/lustre/mgmt/mgmt_svc.c
@@ -32,7 +32,6 @@
 #include <linux/obd_class.h>
 #include <linux/lustre_net.h>
 
-#define MGMT_NEVENTS     1024UL
 #define MGMT_NBUFS       128UL
 #define MGMT_BUFSIZE     8192
 #define MGMT_MAXREQSIZE  512
@@ -89,10 +88,10 @@ static int mgmt_setup(struct obd_device *obd, obd_count len, void *buf)
         if (mgmt_initialized)
                 RETURN(-EALREADY);
         
-        mgmt_service = ptlrpc_init_svc(MGMT_NEVENTS, MGMT_NBUFS, MGMT_BUFSIZE,
-                                       MGMT_MAXREQSIZE, MGMT_REQUEST_PORTAL,
-                                       MGMT_REPLY_PORTAL, mgmt_handler,
-                                       "mgmt", obd);
+        mgmt_service = 
+                ptlrpc_init_svc(MGMT_NBUFS, MGMT_BUFSIZE, MGMT_MAXREQSIZE, 
+                                MGMT_REQUEST_PORTAL, MGMT_REPLY_PORTAL, 
+                                mgmt_handler, "mgmt", obd);
         if (!mgmt_service) {
                 CERROR("Failed to start mgmt service\n");
                 RETURN(-ENOMEM);