More connection-level hackery for the DLM

diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index aa44911..f136e10 100644 (file)
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -81,12 +81,12 @@ int ldlm_cli_enqueue(struct ptlrpc_client *cl, struct ptlrpc_connection *conn,
          * The MDS needs to send lock requests to itself, but it doesn't want to
          * go through the whole hassle of setting up proper connections.  Soon,
          * these will just be function calls, but until I have the time, just
-         * send these requests at level NEW, so that they go through.
+         * set this connection to level FULL so that they go through.
          *
          * Since the MDS is the only user of PLAIN locks right now, we can use
          * that to distinguish.  Sorry. */
         if (type == LDLM_PLAIN)
-                req->rq_level = LUSTRE_CONN_NEW;
+                conn->c_level = LUSTRE_CONN_FULL;
 
         rc = ptlrpc_queue_wait(req);
         /* FIXME: status check here? */

diff --git a/lustre/lib/l_net.c b/lustre/lib/l_net.c
index eb08b76..f08a626 100644 (file)
--- a/lustre/lib/l_net.c
+++ b/lustre/lib/l_net.c
@@ -83,6 +83,8 @@ int target_handle_connect(struct ptlrpc_request *req)
 
         req->rq_export = export;
         export->exp_connection = req->rq_connection;
+#warning Peter: is this the right place to upgrade the server connection level?
+        req->rq_connection->c_level = LUSTRE_CONN_FULL;
         RETURN(0);
 }