From owner-svn-src-head@FreeBSD.ORG Thu Jan 26 00:07:35 2012 Return-Path: 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 0F19F106566C; Thu, 26 Jan 2012 00:07:35 +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 D77788FC14; Thu, 26 Jan 2012 00:07:34 +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 q0Q07YUS052476; Thu, 26 Jan 2012 00:07:34 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0Q07YN5052473; Thu, 26 Jan 2012 00:07:34 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201201260007.q0Q07YN5052473@svn.freebsd.org> From: Rick Macklem Date: Thu, 26 Jan 2012 00:07:34 +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: r230559 - in head/sys: fs/nfsclient nfsclient 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jan 2012 00:07:35 -0000 Author: rmacklem Date: Thu Jan 26 00:07:34 2012 New Revision: 230559 URL: http://svn.freebsd.org/changeset/base/230559 Log: Revert r230516, since it doesn't really fix the problem. Modified: head/sys/fs/nfsclient/nfs_clvfsops.c head/sys/nfsclient/nfs_vfsops.c Modified: head/sys/fs/nfsclient/nfs_clvfsops.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clvfsops.c Wed Jan 25 23:33:50 2012 (r230558) +++ head/sys/fs/nfsclient/nfs_clvfsops.c Thu Jan 26 00:07:34 2012 (r230559) @@ -999,23 +999,6 @@ nfs_mount(struct mount *mp) error = EIO; goto out; } - - /* - * Cannot switch to UDP if current rsize/wsize/readdirsize is - * too large, since there may be an I/O RPC in progress that - * will get retried after the switch to the UDP socket. These - * retries will fail over and over and over again. - */ - if (args.sotype == SOCK_DGRAM && - (nmp->nm_rsize > NFS_MAXDGRAMDATA || - nmp->nm_wsize > NFS_MAXDGRAMDATA || - nmp->nm_readdirsize > NFS_MAXDGRAMDATA)) { - vfs_mount_error(mp, - "old rsize/wsize/readdirsize greater than UDP max"); - error = EINVAL; - goto out; - } - /* * When doing an update, we can't change version, * security, switch lockd strategies or change cookie Modified: head/sys/nfsclient/nfs_vfsops.c ============================================================================== --- head/sys/nfsclient/nfs_vfsops.c Wed Jan 25 23:33:50 2012 (r230558) +++ head/sys/nfsclient/nfs_vfsops.c Thu Jan 26 00:07:34 2012 (r230559) @@ -1116,23 +1116,6 @@ nfs_mount(struct mount *mp) error = EIO; goto out; } - - /* - * Cannot switch to UDP if current rsize/wsize/readdirsize is - * too large, since there may be an I/O RPC in progress that - * will get retried after the switch to the UDP socket. These - * retries will fail over and over and over again. - */ - if (args.sotype == SOCK_DGRAM && - (nmp->nm_rsize > NFS_MAXDGRAMDATA || - nmp->nm_wsize > NFS_MAXDGRAMDATA || - nmp->nm_readdirsize > NFS_MAXDGRAMDATA)) { - vfs_mount_error(mp, - "old rsize/wsize/readdirsize greater than UDP max"); - error = EINVAL; - goto out; - } - /* * When doing an update, we can't change from or to * v3, switch lockd strategies or change cookie translation