From owner-svn-src-head@FreeBSD.ORG  Sun Apr 17 20:01:33 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 50886106566B;
	Sun, 17 Apr 2011 20:01:33 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 418E38FC13;
	Sun, 17 Apr 2011 20:01:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3HK1Xj1048135;
	Sun, 17 Apr 2011 20:01:33 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3HK1XT1048133;
	Sun, 17 Apr 2011 20:01:33 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201104172001.p3HK1XT1048133@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sun, 17 Apr 2011 20:01:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220752 - head/sys/fs/nfs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Apr 2011 20:01:33 -0000

Author: rmacklem
Date: Sun Apr 17 20:01:32 2011
New Revision: 220752
URL: http://svn.freebsd.org/changeset/base/220752

Log:
  Get rid of the "nfscl: consider increasing kern.ipc.maxsockbuf"
  message that was generated when doing experimental NFS client
  mounts. I put that message in because the krpc would hang with
  the default size for mounts that used large rsize/wsize values.
  Since the bug that caused these hangs was fixed by r213756,
  I think the message is no longer needed.
  
  MFC after:	2 weeks

Modified:
  head/sys/fs/nfs/nfs_commonkrpc.c

Modified: head/sys/fs/nfs/nfs_commonkrpc.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonkrpc.c	Sun Apr 17 18:56:17 2011	(r220751)
+++ head/sys/fs/nfs/nfs_commonkrpc.c	Sun Apr 17 20:01:32 2011	(r220752)
@@ -143,7 +143,7 @@ newnfs_connect(struct nfsmount *nmp, str
 	CLIENT *client;
 	struct netconfig *nconf;
 	struct socket *so;
-	int one = 1, retries, error, printsbmax = 0;
+	int one = 1, retries, error;
 	struct thread *td = curthread;
 
 	/*
@@ -202,13 +202,8 @@ newnfs_connect(struct nfsmount *nmp, str
 		return (error);
 	}
 	do {
-	    if (error != 0 && pktscale > 2) {
+	    if (error != 0 && pktscale > 2)
 		pktscale--;
-		if (printsbmax == 0) {
-		    printf("nfscl: consider increasing kern.ipc.maxsockbuf\n");
-		    printsbmax = 1;
-		}
-	    }
 	    if (nrp->nr_sotype == SOCK_DGRAM) {
 		if (nmp != NULL) {
 			sndreserve = (NFS_MAXDGRAMDATA + NFS_MAXPKTHDR) *