From 0307d0298480f7ee2c18ead4c65909faa6b1f4f2 Mon Sep 17 00:00:00 2001 From: huanghua Date: Sun, 10 Sep 2006 14:30:32 +0000 Subject: [PATCH] fix some small bugs related to recovery. --- lustre/fid/fid_handler.c | 6 ++++-- lustre/fld/fld_handler.c | 3 ++- lustre/mdt/mdt_handler.c | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lustre/fid/fid_handler.c b/lustre/fid/fid_handler.c index d2a5e35..47b463b 100644 --- a/lustre/fid/fid_handler.c +++ b/lustre/fid/fid_handler.c @@ -350,13 +350,15 @@ static int seq_req_handle(struct ptlrpc_request *req, if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) { in = req_capsule_server_get(&info->sti_pill, &RMF_SEQ_RANGE); - + /* umka, FIXME: "in" has not been filled with anything LASSERT(!range_is_zero(in) && range_is_sane(in)); + */ } ctx = req->rq_svc_thread->t_ctx; rc = seq_server_handle(site, ctx, *opc, in, out); - } + } else + rc = -EPROTO; RETURN(rc); } diff --git a/lustre/fld/fld_handler.c b/lustre/fld/fld_handler.c index 5903d7a..8ae70a76 100644 --- a/lustre/fld/fld_handler.c +++ b/lustre/fld/fld_handler.c @@ -190,7 +190,8 @@ static int fld_req_handle(struct ptlrpc_request *req, rc = fld_server_handle(site->ls_server_fld, req->rq_svc_thread->t_ctx, *opc, out, info); - } + } else + rc = -EPROTO; RETURN(rc); } diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c index 224ba9e..eb43567 100644 --- a/lustre/mdt/mdt_handler.c +++ b/lustre/mdt/mdt_handler.c @@ -3133,7 +3133,8 @@ int mdt_postrecov(struct obd_device *obd) if (rc) RETURN(rc); lu_context_enter(&ctxt); - rc = ld->ld_ops->ldo_recovery_complete(&ctxt, + if (ld && ld->ld_ops && ld->ld_ops->ldo_recovery_complete) + rc = ld->ld_ops->ldo_recovery_complete(&ctxt, md2lu_dev(mdt->mdt_child)); lu_context_exit(&ctxt); lu_context_fini(&ctxt); -- 1.8.3.1