summaryrefslogtreecommitdiffstats
path: root/fs/compat.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2006-01-19 16:40:42 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-19 22:11:31 -0800
commit7e732bfc5570b8f9bb5f155cf36e94b2e7d6bf6a (patch)
treef1f15646c7a9488cf0cd0838d04b8bde1193ef21 /fs/compat.c
parent0f36b018b2e314d45af86449f1a97facb1fbe300 (diff)
downloadop-kernel-dev-7e732bfc5570b8f9bb5f155cf36e94b2e7d6bf6a.zip
op-kernel-dev-7e732bfc5570b8f9bb5f155cf36e94b2e7d6bf6a.tar.gz
[PATCH] Fix regression added by ppoll/pselect code.
The compat layer timeout handling changes in: 9f72949f679df06021c9e43886c9191494fdb007 are busted. This is most easily seen with an X application that uses sub-second select/poll timeout such as emacs. You hit a key and it takes a second or so before the app responds. The two ROUND_UP() calls upon entry are using {tv,ts}_sec where it should instead be using {tv_usec,ts_nsec}, which perfectly explains the observed incorrect behavior. Another bug shot down with git bisect. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/compat.c')
-rw-r--r--fs/compat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/compat.c b/fs/compat.c
index 18b21b4..ff0bafc 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -1743,7 +1743,7 @@ asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp,
if ((u64)tv.tv_sec >= (u64)MAX_INT64_SECONDS)
timeout = -1; /* infinite */
else {
- timeout = ROUND_UP(tv.tv_sec, 1000000/HZ);
+ timeout = ROUND_UP(tv.tv_usec, 1000000/HZ);
timeout += tv.tv_sec * HZ;
}
}
@@ -1884,7 +1884,7 @@ asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds,
/* We assume that ts.tv_sec is always lower than
the number of seconds that can be expressed in
an s64. Otherwise the compiler bitches at us */
- timeout = ROUND_UP(ts.tv_sec, 1000000000/HZ);
+ timeout = ROUND_UP(ts.tv_nsec, 1000000000/HZ);
timeout += ts.tv_sec * HZ;
}
OpenPOWER on IntegriCloud