svn commit: r281521 - in stable/9: sys/rpc usr.sbin/nfsd

[Alexander Motin]

Author: mav
Date: Tue Apr 14 09:58:58 2015
New Revision: 281521
URL: https://svnweb.freebsd.org/changeset/base/281521

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/9/sys/rpc/svc_generic.c
  stable/9/sys/rpc/svc_vc.c
  stable/9/usr.sbin/nfsd/nfsd.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/usr.sbin/   (props changed)
  stable/9/usr.sbin/nfsd/   (props changed)

Modified: stable/9/sys/rpc/svc_generic.c
==============================================================================
--- stable/9/sys/rpc/svc_generic.c	Tue Apr 14 09:58:10 2015	(r281520)
+++ stable/9/sys/rpc/svc_generic.c	Tue Apr 14 09:58:58 2015	(r281521)
@@ -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/9/sys/rpc/svc_vc.c
==============================================================================
--- stable/9/sys/rpc/svc_vc.c	Tue Apr 14 09:58:10 2015	(r281520)
+++ stable/9/sys/rpc/svc_vc.c	Tue Apr 14 09:58:58 2015	(r281521)
@@ -178,7 +178,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/9/usr.sbin/nfsd/nfsd.c
==============================================================================
--- stable/9/usr.sbin/nfsd/nfsd.c	Tue Apr 14 09:58:10 2015	(r281520)
+++ stable/9/usr.sbin/nfsd/nfsd.c	Tue Apr 14 09:58:58 2015	(r281521)
@@ -605,7 +605,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);
 				}
@@ -680,7 +680,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);
 				}