From: ericm <ericm>
Date: Tue, 26 Aug 2003 03:28:43 +0000 (+0000)
Subject: [portals]:
X-Git-Tag: v1_7_0_51~2^9~342
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=2b74ae40342ff40dd45c49a7084cfbfa54ef0724;p=fs%2Flustre-release.git

[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
--- 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
--- 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);