From: shadow <shadow>
Date: Thu, 1 Oct 2009 04:32:21 +0000 (+0000)
Subject: don't try dump lock handles from llog cancel requests.
X-Git-Tag: v1_8_2_01~1^2~59
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=a010c77fcd803a5384d5253c150d0a8458032ce1;p=fs%2Flustre-release.git

don't try dump lock handles from llog cancel requests.

Branch b1_8
b=20349
i=zam
---

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 03b5340..d396144 100644
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -1821,12 +1821,14 @@ static int ldlm_cancel_handler(struct ptlrpc_request *req)
                        libcfs_id2str(req->rq_peer),
                        lustre_msg_get_handle(req->rq_reqmsg)->cookie);
 
-                dlm_req = lustre_swab_reqbuf(req, DLM_LOCKREQ_OFF,
-                                             sizeof(*dlm_req),
-                                             lustre_swab_ldlm_request);
-                if (dlm_req != NULL)
-                        ldlm_lock_dump_handle(D_ERROR,
-                                              &dlm_req->lock_handle[0]);
+                if (lustre_msg_get_opc(req->rq_reqmsg) == LDLM_CANCEL) {
+                        dlm_req = lustre_swab_reqbuf(req, DLM_LOCKREQ_OFF,
+                                                     sizeof(*dlm_req),
+                                                     lustre_swab_ldlm_request);
+                        if (dlm_req != NULL)
+                                ldlm_lock_dump_handle(D_ERROR,
+                                                      &dlm_req->lock_handle[0]);
+                }
 
                 ldlm_callback_reply(req, -ENOTCONN);
                 RETURN(0);