Module Name: src
Committed By: christos
Date: Sun Mar 31 16:45:06 UTC 2013
Modified Files:
src/sys/kern: kern_time.c
Log Message:
always return immediately on error, and if we passed negative seconds,
return with 0.
To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 src/sys/kern/kern_time.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_time.c
diff -u src/sys/kern/kern_time.c:1.177 src/sys/kern/kern_time.c:1.178
--- src/sys/kern/kern_time.c:1.177 Fri Mar 29 06:34:12 2013
+++ src/sys/kern/kern_time.c Sun Mar 31 12:45:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time.c,v 1.177 2013/03/29 10:34:12 martin Exp $ */
+/* $NetBSD: kern_time.c,v 1.178 2013/03/31 16:45:06 christos Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.177 2013/03/29 10:34:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.178 2013/03/31 16:45:06 christos Exp $");
#include <sys/param.h>
#include <sys/resourcevar.h>
@@ -328,10 +328,8 @@ nanosleep1(struct lwp *l, clockid_t cloc
struct timespec rmtstart;
int error, timo;
- if ((error = ts2timo(clock_id, flags, rqt, &timo, &rmtstart)) != 0) {
- if (error == ETIMEDOUT)
- timo = 0;
- }
+ if ((error = ts2timo(clock_id, flags, rqt, &timo, &rmtstart)) != 0)
+ return error == ETIMEDOUT ? 0 : error;
/*
* Avoid inadvertently sleeping forever
