From: alex <alex>
Date: Wed, 25 May 2005 21:35:00 +0000 (+0000)
Subject: b=6368
X-Git-Tag: 1.4.10~1094
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=5489f50e8a3e9bdcaf5c15e8019717ea46650c47;p=fs%2Flustre-release.git

b=6368

 - use time_after_eq() instead of simple comparing
---

diff --git a/lustre/ptlrpc/pinger.c b/lustre/ptlrpc/pinger.c
index f8ec958..77a5cf6 100644
--- a/lustre/ptlrpc/pinger.c
+++ b/lustre/ptlrpc/pinger.c
@@ -132,14 +132,7 @@ static void ptlrpc_pinger_process_import(struct obd_import *imp,
                 imp->imp_force_verify = 0;
         spin_unlock_irqrestore(&imp->imp_lock, flags);
 
-        if (imp->imp_next_ping > this_ping &&
-                        (imp->imp_next_ping - this_ping > obd_timeout * HZ)) {
-                CWARN("wrong ping time %lu (current %lu)\n",
-                      imp->imp_next_ping, this_ping);
-                imp->imp_next_ping = ptlrpc_next_reconnect(imp);
-        }
-
-        if (imp->imp_next_ping > this_ping && force == 0)
+        if (time_after_eq(imp->imp_next_ping, this_ping) && force == 0)
                 return;
 
         if (level == LUSTRE_IMP_DISCON && !imp->imp_deactive) {