From 3526460529c686b660ca5efc169069f87e4a0ecc Mon Sep 17 00:00:00 2001 From: adilger Date: Tue, 12 Apr 2005 09:14:03 +0000 Subject: [PATCH] Branch: b1_4 Log MDS disconnection to obdfilter kernel log. Don't set request portals until after request alloc is verified. b=5515 --- lustre/ptlrpc/recov_thread.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lustre/ptlrpc/recov_thread.c b/lustre/ptlrpc/recov_thread.c index f48d9bc..6d0f118 100644 --- a/lustre/ptlrpc/recov_thread.c +++ b/lustre/ptlrpc/recov_thread.c @@ -192,7 +192,7 @@ int llog_obd_repl_sync(struct llog_ctxt *ctxt, struct obd_export *exp) ENTRY; if (exp && (ctxt->loc_imp == exp->exp_imp_reverse)) { - CDEBUG(D_INFO, "reverse import disconnected, put llcd %p:%p\n", + CDEBUG(D_HA, "reverse import disconnected, put llcd %p:%p\n", ctxt->loc_llcd, ctxt); down(&ctxt->loc_sem); if (ctxt->loc_llcd != NULL) { @@ -343,10 +343,6 @@ static int log_commit_thread(void *arg) request = ptlrpc_prep_req(import, OBD_LOG_CANCEL, 1, &llcd->llcd_cookiebytes, bufs); - /* XXX FIXME bug 249, 5515 */ - request->rq_request_portal = LDLM_CANCEL_REQUEST_PORTAL; - request->rq_reply_portal = LDLM_CANCEL_REPLY_PORTAL; - if (request == NULL) { rc = -ENOMEM; CERROR("error preparing commit: rc %d\n", rc); @@ -359,6 +355,10 @@ static int log_commit_thread(void *arg) break; } + /* XXX FIXME bug 249, 5515 */ + request->rq_request_portal = LDLM_CANCEL_REQUEST_PORTAL; + request->rq_reply_portal = LDLM_CANCEL_REPLY_PORTAL; + request->rq_replen = lustre_msg_size(0, NULL); down(&llcd->llcd_ctxt->loc_sem); if (llcd->llcd_ctxt->loc_imp == NULL) { -- 1.8.3.1