From 2087c8967c1aecf9bc0b39cd7c92c636a8a1a10b Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sun, 23 Nov 1997 10:30:50 +0000
Subject: [PATCH] Fixed some style bugs in the poll() code.

Removed dead code to "Avoid inadvertently sleeping forever".  hzto()
never returns 0.
---
 sys/kern/sys_generic.c | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 514713d093e3..54dc0a81ed05 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_generic.c	8.5 (Berkeley) 1/21/94
- * $Id: sys_generic.c,v 1.31 1997/10/12 20:24:02 phk Exp $
+ * $Id: sys_generic.c,v 1.32 1997/11/06 19:29:20 phk Exp $
  */
 
 #include "opt_ktrace.h"
@@ -65,8 +65,8 @@ static MALLOC_DEFINE(M_IOCTLOPS, "ioctlops", "ioctl data buffer");
 static MALLOC_DEFINE(M_SELECT, "select", "select() buffer");
 MALLOC_DEFINE(M_IOV, "iov", "large iov's");
 
-static int	selscan __P((struct proc *, fd_mask **, fd_mask **, int));
 static int	pollscan __P((struct proc *, struct pollfd *, int));
+static int	selscan __P((struct proc *, fd_mask **, fd_mask **, int));
 
 /*
  * Read system call.
@@ -603,11 +603,6 @@ select(p, uap)
 		s = splclock();
 		timevaladd(&atv, &time);
 		timo = hzto(&atv);
-		/*
-		 * Avoid inadvertently sleeping forever.
-		 */
-		if (timo == 0)
-			timo = 1;
 		splx(s);
 	} else
 		timo = 0;
@@ -667,8 +662,8 @@ selscan(p, ibits, obits, nfd)
 	register fd_mask bits;
 	struct file *fp;
 	int n = 0;
-	/* Note; backend also returns POLLHUP/POLLERR if appropriate */
-	static int flag[3] = { POLLRDNORM, POLLWRNORM, POLLRDBAND};
+	/* Note: backend also returns POLLHUP/POLLERR if appropriate. */
+	static int flag[3] = { POLLRDNORM, POLLWRNORM, POLLRDBAND };
 
 	for (msk = 0; msk < 3; msk++) {
 		if (ibits[msk] == NULL)
@@ -723,11 +718,9 @@ poll(p, uap)
 		bits = malloc(ni, M_TEMP, M_WAITOK);
 	else
 		bits = smallbits;
-
 	error = copyin(SCARG(uap, fds), bits, ni);
 	if (error)
 		goto done;
-
 	if (SCARG(uap, timeout) != INFTIM) {
 		atv.tv_sec = SCARG(uap, timeout) / 1000;
 		atv.tv_usec = (SCARG(uap, timeout) % 1000) * 1000;
@@ -738,11 +731,6 @@ poll(p, uap)
 		s = splclock();
 		timevaladd(&atv, &time);
 		timo = hzto(&atv);
-		/*
-		 * Avoid inadvertently sleeping forever.
-		 */
-		if (timo == 0)
-			timo = 1;
 		splx(s);
 	} else
 		timo = 0;
@@ -805,8 +793,10 @@ pollscan(p, fds, nfd)
 				fds->revents = POLLNVAL;
 				n++;
 			} else {
-				/* Note: backend also returns POLLHUP and
-				 * POLLERR if appropriate */
+				/*
+				 * Note: backend also returns POLLHUP and
+				 * POLLERR if appropriate.
+				 */
 				fds->revents = (*fp->f_ops->fo_poll)(fp,
 				    fds->events, fp->f_cred, p);
 				if (fds->revents != 0)