From 305790b1f509b60a0af8963d76aca89af0089aff Mon Sep 17 00:00:00 2001 From: yury Date: Mon, 16 Oct 2006 16:54:26 +0000 Subject: [PATCH] - in abort_req_replay_queue() pass correct count of fields to lustre_pack_reply(). --- lustre/fld/fld_request.c | 2 +- lustre/ldlm/ldlm_lib.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lustre/fld/fld_request.c b/lustre/fld/fld_request.c index 2fb325d..d1e0bff 100644 --- a/lustre/fld/fld_request.c +++ b/lustre/fld/fld_request.c @@ -300,7 +300,7 @@ int fld_client_init(struct lu_client_fld *fld, memset(&fld->lcf_stat, 0, sizeof(fld->lcf_stat)); snprintf(fld->lcf_name, sizeof(fld->lcf_name), - "cli-srv-%s", prefix); + "cli-%s", prefix); if (!hash_is_sane(hash)) { CERROR("%s: Wrong hash function %#x\n", diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c index 76946e2..125eb6f 100644 --- a/lustre/ldlm/ldlm_lib.c +++ b/lustre/ldlm/ldlm_lib.c @@ -1002,7 +1002,7 @@ static void abort_req_replay_queue(struct obd_device *obd) DEBUG_REQ(D_ERROR, req, "aborted:"); req->rq_status = -ENOTCONN; req->rq_type = PTL_RPC_MSG_ERR; - rc = lustre_pack_reply(req, 0, NULL, NULL); + rc = lustre_pack_reply(req, 1, NULL, NULL); if (rc == 0) { ptlrpc_reply(req); } else { @@ -1414,6 +1414,7 @@ static int target_recovery_thread(void *arg) spin_lock_bh(&obd->obd_processing_task_lock); target_cancel_recovery_timer(obd); spin_unlock_bh(&obd->obd_processing_task_lock); + /* If some clients haven't replayed requests in time, evict them */ if (obd->obd_abort_recovery) { int stale; -- 1.8.3.1