Author: mav
Date: Tue Apr 14 09:58:10 2015
New Revision: 281520
URL: https://svnweb.freebsd.org/changeset/base/281520
Log:
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.
Modified:
stable/10/sys/rpc/svc_generic.c
stable/10/sys/rpc/svc_vc.c
stable/10/usr.sbin/nfsd/nfsd.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/rpc/svc_generic.c
==============================================================================
--- stable/10/sys/rpc/svc_generic.c Tue Apr 14 07:25:57 2015
(r281519)
+++ stable/10/sys/rpc/svc_generic.c Tue Apr 14 09:58:10 2015
(r281520)
@@ -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)) {
Modified: stable/10/sys/rpc/svc_vc.c
==============================================================================
--- stable/10/sys/rpc/svc_vc.c Tue Apr 14 07:25:57 2015 (r281519)
+++ stable/10/sys/rpc/svc_vc.c Tue Apr 14 09:58:10 2015 (r281520)
@@ -177,7 +177,7 @@ svc_vc_create(SVCPOOL *pool, struct sock
xprt_register(xprt);
- solisten(so, SOMAXCONN, curthread);
+ solisten(so, -1, curthread);
SOCKBUF_LOCK(&so->so_rcv);
xprt->xp_upcallset = 1;
Modified: stable/10/usr.sbin/nfsd/nfsd.c
==============================================================================
--- stable/10/usr.sbin/nfsd/nfsd.c Tue Apr 14 07:25:57 2015
(r281519)
+++ stable/10/usr.sbin/nfsd/nfsd.c Tue Apr 14 09:58:10 2015
(r281520)
@@ -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);
}
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
