branch: HEAD

ignore ctx fini rpc in lock callback handler.
b=14849
r=h.huang

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 8c2ea6c..cc802d1 100644 (file)
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -1524,6 +1524,10 @@ static int ldlm_callback_handler(struct ptlrpc_request *req)
          * incoming request message body, but I am responsible for the
          * message buffers. */
 
+        /* do nothing for sec context finalize */
+        if (lustre_msg_get_opc(req->rq_reqmsg) == SEC_CTX_FINI)
+                RETURN(0);
+
         req_capsule_init(&req->rq_pill, req, RCL_SERVER);
 
         if (req->rq_export == NULL) {
@@ -1611,9 +1615,6 @@ static int ldlm_callback_handler(struct ptlrpc_request *req)
                 rc = llog_origin_handle_close(req);
                 ldlm_callback_reply(req, rc);
                 RETURN(0);
-        case SEC_CTX_FINI:
-                /* do nothing */
-                RETURN(0);
         default:
                 CERROR("unknown opcode %u\n",
                        lustre_msg_get_opc(req->rq_reqmsg));