[patch] sys_epoll_wait() timeout saga ...

The sys_epoll_wait() function was not handling correctly negative timeouts (besides -1), and like sys_poll(), was comparing millisec to secs in testing the upper timeout limit.

Signed-off-by: Davide Libenzi <[email protected]>


- Davide

--- a/fs/eventpoll.c	2005-09-23 10:56:57.000000000 -0700
+++ b/fs/eventpoll.c	2005-09-23 11:00:06.000000000 -0700
@@ -1507,7 +1507,7 @@
 	 * and the overflow condition. The passed timeout is in milliseconds,
 	 * that why (t * HZ) / 1000.
 	 */
-	jtimeout = timeout == -1 || timeout > (MAX_SCHEDULE_TIMEOUT - 1000) / HZ ?
+	jtimeout = timeout < 0 || (timeout / 1000) >= (MAX_SCHEDULE_TIMEOUT / HZ) ?
 		MAX_SCHEDULE_TIMEOUT: (timeout * HZ + 999) / 1000;
 
 retry:

---

• Follow-Ups:
  • Re: [patch] sys_epoll_wait() timeout saga ...
    • From: Willy Tarreau <[email protected]>
  • Re: [patch] sys_epoll_wait() timeout saga ...
    • From: Nish Aravamudan <[email protected]>

• Prev by Date: Re: The system works (2.6.14-rc2): functional k8n-dl
• Next by Date: Re: Trapping Block I/O
• Previous by thread: [patch] Make epoll_wait() handle negative timeouts as MAX_SCHEDULE_TIMEOUT ...
• Next by thread: Re: [patch] sys_epoll_wait() timeout saga ...
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]