From a010c77fcd803a5384d5253c150d0a8458032ce1 Mon Sep 17 00:00:00 2001 From: shadow Date: Thu, 1 Oct 2009 04:32:21 +0000 Subject: [PATCH] don't try dump lock handles from llog cancel requests. Branch b1_8 b=20349 i=zam --- lustre/ldlm/ldlm_lockd.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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); -- 1.8.3.1