tcpnal:

  since we switched to the new timeout mechanism, the old hack code coulde
  be removed now.

diff --git a/lnet/ulnds/select.c b/lnet/ulnds/select.c
index fe24efc..c4ccae1 100644 (file)
--- a/lnet/ulnds/select.c
+++ b/lnet/ulnds/select.c
@@ -126,15 +126,6 @@ void select_timer_block(when until)
         timeout_pointer=&timeout;
     } else timeout_pointer=0;
 
-
-    /* FIXME
-     * temporarily add timer for endless waiting problem.
-     * FIXME
-     */
-    timeout.tv_sec = 1;
-    timeout.tv_usec = 0;
-    timeout_pointer=&timeout;
-
     FD_ZERO(&fds[0]);
     FD_ZERO(&fds[1]);
     FD_ZERO(&fds[2]);

diff --git a/lnet/ulnds/socklnd/select.c b/lnet/ulnds/socklnd/select.c
index fe24efc..c4ccae1 100644 (file)
--- a/lnet/ulnds/socklnd/select.c
+++ b/lnet/ulnds/socklnd/select.c
@@ -126,15 +126,6 @@ void select_timer_block(when until)
         timeout_pointer=&timeout;
     } else timeout_pointer=0;
 
-
-    /* FIXME
-     * temporarily add timer for endless waiting problem.
-     * FIXME
-     */
-    timeout.tv_sec = 1;
-    timeout.tv_usec = 0;
-    timeout_pointer=&timeout;
-
     FD_ZERO(&fds[0]);
     FD_ZERO(&fds[1]);
     FD_ZERO(&fds[2]);

diff --git a/lustre/portals/unals/select.c b/lustre/portals/unals/select.c
index fe24efc..c4ccae1 100644 (file)
--- a/lustre/portals/unals/select.c
+++ b/lustre/portals/unals/select.c
@@ -126,15 +126,6 @@ void select_timer_block(when until)
         timeout_pointer=&timeout;
     } else timeout_pointer=0;
 
-
-    /* FIXME
-     * temporarily add timer for endless waiting problem.
-     * FIXME
-     */
-    timeout.tv_sec = 1;
-    timeout.tv_usec = 0;
-    timeout_pointer=&timeout;
-
     FD_ZERO(&fds[0]);
     FD_ZERO(&fds[1]);
     FD_ZERO(&fds[2]);