diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2010-07-15 18:44:58 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2010-07-15 18:44:58 +0000 |
| commit | c5dfcf4cc18700fae333f330f5b5354f54f302c8 (patch) | |
| tree | 56ffeaf9a83c6c97512222192ff00e6828bafd98 /sys/compat | |
| parent | fcc06be1b257f0cf31b9841c0079c675099713fe (diff) | |
| download | src-c5dfcf4cc18700fae333f330f5b5354f54f302c8.tar.gz src-c5dfcf4cc18700fae333f330f5b5354f54f302c8.zip | |
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.
Notes
Notes:
svn path=/head/; revision=210132
Diffstat (limited to 'sys/compat')
| -rw-r--r-- | sys/compat/svr4/svr4_filio.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c index 701bf15690a7..58c641768fa9 100644 --- a/sys/compat/svr4/svr4_filio.c +++ b/sys/compat/svr4/svr4_filio.c @@ -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); } |