[portals]:

  PtlEQWait_timeout(): if left_over is 0, don't call alarm with it,
  otherwise we'll not got timeout notification.

diff --git a/lnet/lnet/api-eq.c b/lnet/lnet/api-eq.c
index e066619..c8734f7 100644 (file)
--- a/lnet/lnet/api-eq.c
+++ b/lnet/lnet/api-eq.c
@@ -143,7 +143,7 @@ int PtlEQWait_timeout(ptl_handle_eq_t eventq_in, ptl_event_t * event_out,
         left_over = alarm(timeout);
         prev = signal(SIGALRM, eq_timeout);
         time_at_start = time(NULL);
-        if (left_over < timeout)
+        if (left_over && left_over < timeout)
                 alarm(left_over);
 
         rc = PtlEQWait(eventq_in, event_out);

diff --git a/lustre/portals/portals/api-eq.c b/lustre/portals/portals/api-eq.c
index e066619..c8734f7 100644 (file)
--- a/lustre/portals/portals/api-eq.c
+++ b/lustre/portals/portals/api-eq.c
@@ -143,7 +143,7 @@ int PtlEQWait_timeout(ptl_handle_eq_t eventq_in, ptl_event_t * event_out,
         left_over = alarm(timeout);
         prev = signal(SIGALRM, eq_timeout);
         time_at_start = time(NULL);
-        if (left_over < timeout)
+        if (left_over && left_over < timeout)
                 alarm(left_over);
 
         rc = PtlEQWait(eventq_in, event_out);