From owner-svn-src-all@FreeBSD.ORG Sun May 1 03:01:21 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A54C1065670; Sun, 1 May 2011 03:01:21 +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 671578FC0A; Sun, 1 May 2011 03:01:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4131LSo073744; Sun, 1 May 2011 03:01:21 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4131L6W073742; Sun, 1 May 2011 03:01:21 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201105010301.p4131L6W073742@svn.freebsd.org> From: Rick Macklem Date: Sun, 1 May 2011 03:01:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r221293 - stable/8/sys/fs/nfs X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 May 2011 03:01:21 -0000 Author: rmacklem Date: Sun May 1 03:01:21 2011 New Revision: 221293 URL: http://svn.freebsd.org/changeset/base/221293 Log: MFC: r220752 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, which fixed the way the krpc used soreserve(), I think the message is no longer needed. Modified: stable/8/sys/fs/nfs/nfs_commonkrpc.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/fs/nfs/nfs_commonkrpc.c ============================================================================== --- stable/8/sys/fs/nfs/nfs_commonkrpc.c Sun May 1 02:47:54 2011 (r221292) +++ stable/8/sys/fs/nfs/nfs_commonkrpc.c Sun May 1 03:01:21 2011 (r221293) @@ -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) *