Author: trasz
Date: Thu Jul 15 18:44:58 2010
New Revision: 210132
URL: http://svn.freebsd.org/changeset/base/210132
Log:
Make svr4(4) version of poll(2) use the same limit of file descriptors as the
usual poll(2) does, instead of checking resource limits.
Modified:
head/sys/compat/svr4/svr4_filio.c
Modified: head/sys/compat/svr4/svr4_filio.c
==============================================================================
--- head/sys/compat/svr4/svr4_filio.c Thu Jul 15 17:49:35 2010
(r210131)
+++ head/sys/compat/svr4/svr4_filio.c Thu Jul 15 18:44:58 2010
(r210132)
@@ -40,8 +40,6 @@ __FBSDID("$FreeBSD$");
#include <sys/poll.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
-#include <sys/resource.h>
-#include <sys/resourcevar.h>
#include <sys/sysproto.h>
@@ -67,8 +65,7 @@ svr4_sys_poll(td, uap)
u_long siz;
PROC_LOCK(td->td_proc);
- if (uap->nfds > lim_cur(td->td_proc, RLIMIT_NOFILE) &&
- uap->nfds > FD_SETSIZE) {
+ if (uap->nfds > maxfilesperproc && uap->nfds > FD_SETSIZE) {
PROC_UNLOCK(td->td_proc);
return (EINVAL);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
