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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
