b=606116

Add a check for req->rq_export in ldlm_callback_handler, to immediately return
an error instead of later triggering the 'conn' assertion in ptl_send_buf

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 4c473d4..b16cdf4 100644 (file)
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -466,6 +466,12 @@ static int ldlm_callback_handler(struct ptlrpc_request *req)
                 GOTO(out, rc);
         }
 
+        if (req->rq_export == NULL) {
+                CERROR("lustre_dlm: operation %d with missing/invalid export\n",
+                       req->rq_reqmsg->opc);
+                GOTO(out, rc = -ENOTCONN);
+        }
+
         switch (req->rq_reqmsg->opc) {
         case LDLM_BL_CALLBACK:
                 CDEBUG(D_INODE, "blocking ast\n");