X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Flib-msg.c;h=1ed75cddd1d34cb7190418ec45b17c612a11de1e;hp=607001b8bd212e9f563c0d638c0187fc4778f728;hb=9cc0a5ff5fc8f45aa60cd0407ae9893d5c116ccd;hpb=23a2c92f203ff2f39bcc083e6b6220968c17b475

diff --git a/lnet/lnet/lib-msg.c b/lnet/lnet/lib-msg.c
index 607001b..1ed75cd 100644
--- a/lnet/lnet/lib-msg.c
+++ b/lnet/lnet/lib-msg.c
@@ -890,8 +890,6 @@ lnet_health_check(struct lnet_msg *msg)
 		 * faster recovery.
 		 */
 		lnet_inc_healthv(&ni->ni_healthv, lnet_health_sensitivity);
-		lnet_net_lock(0);
-		ni->ni_ping_count = 0;
 		/*
 		 * It's possible msg_txpeer is NULL in the LOLND
 		 * case. Only increment the peer's health if we're
@@ -901,7 +899,9 @@ lnet_health_check(struct lnet_msg *msg)
 		 * as indication that the router is fully healthy.
 		 */
 		if (lpni && msg->msg_rx_committed) {
+			lnet_net_lock(0);
 			lpni->lpni_ping_count = 0;
+			ni->ni_ping_count = 0;
 			/*
 			 * If we're receiving a message from the router or
 			 * I'm a router, then set that lpni's health to
@@ -927,8 +927,8 @@ lnet_health_check(struct lnet_msg *msg)
 						&the_lnet.ln_mt_peerNIRecovq,
 						ktime_get_seconds());
 			}
+			lnet_net_unlock(0);
 		}
-		lnet_net_unlock(0);
 
 		/* we can finalize this message */
 		return -1;