From 1a7a50b1f042d0adf674459988f75b1bb78c7d92 Mon Sep 17 00:00:00 2001 From: narasimd Date: Wed, 11 Dec 2002 06:48:28 +0000 Subject: [PATCH] Updating b_narasimd branch. --- lustre/lib/target.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/lib/target.c b/lustre/lib/target.c index 8786ee8..141e155 100644 --- a/lustre/lib/target.c +++ b/lustre/lib/target.c @@ -69,7 +69,8 @@ int target_handle_connect(struct ptlrpc_request *req) rc = obd_connect(&conn, target, cluuid, ptlrpc_recovd, target_revoke_connection); - if (rc) + /* EALREADY indicates a reconnection, send the reply normally. */ + if (rc && rc != EALREADY) GOTO(out, rc); rc = lustre_pack_msg(0, NULL, NULL, &req->rq_replen, &req->rq_repmsg); @@ -99,8 +100,8 @@ int target_handle_connect(struct ptlrpc_request *req) dlmimp->imp_handle.addr = req->rq_reqmsg->addr; dlmimp->imp_handle.cookie = req->rq_reqmsg->cookie; dlmimp->imp_obd = /* LDLM! */ NULL; - - req->rq_connection->c_level = LUSTRE_CONN_FULL; + spin_lock_init(&dlmimp->imp_lock); + dlmimp->imp_level = LUSTRE_CONN_FULL; out: req->rq_status = rc; RETURN(rc); @@ -147,7 +148,6 @@ static int target_fence_failed_connection(struct ptlrpc_connection *conn) { ENTRY; - conn->c_level = LUSTRE_CONN_RECOVD; conn->c_recovd_data.rd_phase = RD_PREPARED; RETURN(0); -- 1.8.3.1