Mercurial > illumos > illumos-gate

changeset 10257:d987765ad743

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout 6352258: needs more work
author ok199659 <Ondrej.Kubecka@Sun.COM>
date Tue, 04 Aug 2009 13:44:26 -0700
parents a296cc1c90a8
children ecf43a496539
files usr/src/uts/common/syscall/poll.c
diffstat 1 files changed, 2 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/syscall/poll.c	Tue Aug 04 12:51:42 2009 -0700
+++ b/usr/src/uts/common/syscall/poll.c	Tue Aug 04 13:44:26 2009 -0700
@@ -389,16 +389,8 @@
 	old_nfds = ps->ps_nfds;
 	if (nfds != old_nfds) {
 
-		if (old_nfds != 0)
-			kmem_free(ps->ps_pollfd, old_nfds * sizeof (pollfd_t));
-
-		if ((pollfdp =
-		    kmem_alloc(nfds * sizeof (pollfd_t), KM_NOSLEEP)) == NULL) {
-			ps->ps_nfds = 0;
-			error = EAGAIN;
-			goto pollout;
-		}
-
+		kmem_free(ps->ps_pollfd, old_nfds * sizeof (pollfd_t));
+		pollfdp = kmem_alloc(nfds * sizeof (pollfd_t), KM_SLEEP);
 		ps->ps_pollfd = pollfdp;
 		ps->ps_nfds = nfds;
 	}