From 4d69c0d2f6ee2222138b4e98940227f0bb67fc10 Mon Sep 17 00:00:00 2001 From: johann Date: Tue, 5 May 2009 17:06:21 +0000 Subject: [PATCH] Branch b1_8 b=18674 i=shadow i=bobijam print the correct number of active rpcs. --- lustre/ldlm/ldlm_lib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c index b8e5fd6..e66e2aa 100644 --- a/lustre/ldlm/ldlm_lib.c +++ b/lustre/ldlm/ldlm_lib.c @@ -825,10 +825,11 @@ no_export: GOTO(out, rc = -EBUSY); } else if (req->rq_export != NULL && atomic_read(&export->exp_rpc_count) > 1) { + /* the current connect rpc has increased exp_rpc_count */ CWARN("%s: refuse reconnection from %s@%s to 0x%p; still busy " "with %d active RPCs\n", target->obd_name, cluuid.uuid, libcfs_nid2str(req->rq_peer.nid), - export, atomic_read(&export->exp_rpc_count)); + export, atomic_read(&export->exp_rpc_count) - 1); GOTO(out, rc = -EBUSY); } else if (lustre_msg_get_conn_cnt(req->rq_reqmsg) == 1) { CERROR("%s: NID %s (%s) reconnected with 1 conn_cnt; " -- 1.8.3.1