- initialize LDLM client data on obdfilter, not ost, because that's where

  the ldlm requests come from.

diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index 56cc673..53e60eb 100644 (file)
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -403,6 +403,9 @@ static int filter_setup(struct obd_device *obddev, obd_count len, void *buf)
         if (obddev->obd_namespace == NULL)
                 LBUG();
 
+        ptlrpc_init_client(LDLM_REQUEST_PORTAL, LDLM_REPLY_PORTAL,
+                           "filter_ldlm_client", &obddev->obd_ldlm_client);
+
         RETURN(0);
 
 err_kfree:

diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index d956d72..1102e4e 100644 (file)
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -615,9 +615,6 @@ static int ost_setup(struct obd_device *obddev, obd_count len, void *buf)
                 }
         }
 
-        ptlrpc_init_client(LDLM_REQUEST_PORTAL, LDLM_REPLY_PORTAL,
-                           "ost_ldlm_client", &obddev->obd_ldlm_client);
-
         RETURN(0);
 
 error_disc:

diff --git a/lustre/ptlrpc/niobuf.c b/lustre/ptlrpc/niobuf.c
index 872e8f5..1142380 100644 (file)
--- a/lustre/ptlrpc/niobuf.c
+++ b/lustre/ptlrpc/niobuf.c
@@ -73,6 +73,8 @@ static int ptl_send_buf(struct ptlrpc_request *request,
         CDEBUG(D_NET, "Sending %d bytes to portal %d, xid %Ld\n",
                request->rq_req_md.length, portal, request->rq_xid);
 
+        if (!portal)
+                LBUG();
         rc = PtlPut(md_h, PTL_NOACK_REQ, remote_id, portal, 0, request->rq_xid,
                     0, 0);
         if (rc != PTL_OK) {