From 0149d177fbc19ac4c789f7a5b701c8236ab2ff67 Mon Sep 17 00:00:00 2001 From: Rick Macklem Date: Thu, 26 Jan 2012 00:07:34 +0000 Subject: [PATCH] Revert r230516, since it doesn't really fix the problem. --- sys/fs/nfsclient/nfs_clvfsops.c | 17 ----------------- sys/nfsclient/nfs_vfsops.c | 17 ----------------- 2 files changed, 34 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c index e6d146f84493..e882d004622e 100644 --- a/sys/fs/nfsclient/nfs_clvfsops.c +++ b/sys/fs/nfsclient/nfs_clvfsops.c @@ -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 diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index 5c257fcda492..82891f9e29f8 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -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