From 11b1023b7d7dc43e84246fb9b78e2107f45ae3f7 Mon Sep 17 00:00:00 2001 From: David Xu Date: Wed, 2 Apr 2008 04:26:59 +0000 Subject: [PATCH] Er, don't restart a timeout version. --- sys/kern/kern_umtx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index de132aedc17f..344c104fbdea 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -2481,7 +2481,8 @@ do_rw_rdlock2(struct thread *td, void *obj, long val, struct timespec *timeout) timespecsub(&ts3, &ts2); TIMESPEC_TO_TIMEVAL(&tv, &ts3); } - + if (error == ERESTART) + error = EINTR; return (error); } @@ -2597,7 +2598,8 @@ do_rw_wrlock2(struct thread *td, void *obj, struct timespec *timeout) timespecsub(&ts3, &ts2); TIMESPEC_TO_TIMEVAL(&tv, &ts3); } - + if (error == ERESTART) + error = EINTR; return (error); }