diff options
author | mav <mav@FreeBSD.org> | 2015-04-14 09:58:10 +0000 |
---|---|---|
committer | mav <mav@FreeBSD.org> | 2015-04-14 09:58:10 +0000 |
commit | 25a103ace6367d0a8f62111662452470439af6fc (patch) | |
tree | 7f760885977f79a656d3345ff565c0aa089c7d1f | |
parent | edfb89679048b8f6629f8a931375c42d835f2823 (diff) | |
download | FreeBSD-src-25a103ace6367d0a8f62111662452470439af6fc.zip FreeBSD-src-25a103ace6367d0a8f62111662452470439af6fc.tar.gz |
MFC r281199: Remove hard limits on number of accepting NFS connections.
Limits of 5 connections set long ago creates problems for SPEC benchmark.
Make the NFS follow system-wide maximum.
-rw-r--r-- | sys/rpc/svc_generic.c | 4 | ||||
-rw-r--r-- | sys/rpc/svc_vc.c | 2 | ||||
-rw-r--r-- | usr.sbin/nfsd/nfsd.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/rpc/svc_generic.c b/sys/rpc/svc_generic.c index 59e36c2..2ce010d 100644 --- a/sys/rpc/svc_generic.c +++ b/sys/rpc/svc_generic.c @@ -168,7 +168,7 @@ svc_tp_create( taddr = uaddr2taddr(nconf, uaddr); bind.addr = *taddr; free(taddr, M_RPC); - bind.qlen = SOMAXCONN; + bind.qlen = -1; xprt = svc_tli_create(pool, NULL, nconf, &bind, 0, 0); free(bind.addr.buf, M_RPC); } else { @@ -256,7 +256,7 @@ svc_tli_create( goto freedata; } } - solisten(so, SOMAXCONN, curthread); + solisten(so, -1, curthread); } else { if (bindresvport(so, (struct sockaddr *)bindaddr->addr.buf)) { diff --git a/sys/rpc/svc_vc.c b/sys/rpc/svc_vc.c index df1d86e..fb40a34 100644 --- a/sys/rpc/svc_vc.c +++ b/sys/rpc/svc_vc.c @@ -177,7 +177,7 @@ svc_vc_create(SVCPOOL *pool, struct socket *so, size_t sendsize, xprt_register(xprt); - solisten(so, SOMAXCONN, curthread); + solisten(so, -1, curthread); SOCKBUF_LOCK(&so->so_rcv); xprt->xp_upcallset = 1; diff --git a/usr.sbin/nfsd/nfsd.c b/usr.sbin/nfsd/nfsd.c index b114ba6..a0cb5a3 100644 --- a/usr.sbin/nfsd/nfsd.c +++ b/usr.sbin/nfsd/nfsd.c @@ -626,7 +626,7 @@ main(int argc, char **argv) bindhost[i]); nfsd_exit(1); } - if (listen(tcpsock, 5) < 0) { + if (listen(tcpsock, -1) < 0) { syslog(LOG_ERR, "listen failed"); nfsd_exit(1); } @@ -701,7 +701,7 @@ main(int argc, char **argv) bindhost[i]); nfsd_exit(1); } - if (listen(tcp6sock, 5) < 0) { + if (listen(tcp6sock, -1) < 0) { syslog(LOG_ERR, "listen failed"); nfsd_exit(1); } |