From c0549b50bec3eb748d55349a20f1ab0ecff68ef0 Mon Sep 17 00:00:00 2001 From: yury Date: Tue, 21 Oct 2008 17:21:12 +0000 Subject: [PATCH] b=17323 r=adilger,johann - fixes log_cancel resend handling --- lustre/ldlm/ldlm_lockd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c index 60a7549..d455f03 100644 --- a/lustre/ldlm/ldlm_lockd.c +++ b/lustre/ldlm/ldlm_lockd.c @@ -1578,6 +1578,7 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) case OBD_LOG_CANCEL: /* remove this eventually - for 1.4.0 compat */ OBD_FAIL_RETURN(OBD_FAIL_OBD_LOG_CANCEL_NET, 0); rc = llog_origin_handle_cancel(req); + OBD_FAIL_RETURN(OBD_FAIL_OBD_LOG_CANCEL_REP, 0); ldlm_callback_reply(req, rc); RETURN(0); case OBD_QC_CALLBACK: @@ -1744,6 +1745,7 @@ static int ldlm_cancel_handler(struct ptlrpc_request *req) case OBD_LOG_CANCEL: OBD_FAIL_RETURN(OBD_FAIL_OBD_LOG_CANCEL_NET, 0); rc = llog_origin_handle_cancel(req); + OBD_FAIL_RETURN(OBD_FAIL_OBD_LOG_CANCEL_REP, 0); ldlm_callback_reply(req, rc); RETURN(0); default: -- 1.8.3.1