Revert r230516, since it doesn't really fix the problem.

This commit is contained in:
Rick Macklem 2012-01-26 00:07:34 +00:00
parent 4636d24459
commit 0149d177fb
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=230559
2 changed files with 0 additions and 34 deletions

View File

@ -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

View File

@ -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