svn commit: r252739 - stable/9/sys/fs/nfsclient

[Rick Macklem]

Author: rmacklem
Date: Fri Jul  5 01:22:37 2013
New Revision: 252739
URL: http://svnweb.freebsd.org/changeset/base/252739

Log:
  MFC: r252067
  Since some NFSv4 servers enforce the requirement for a reserved port#,
  enable use of the (no)resvport mount option for NFSv4. I had thought
  that the RFC required that non-reserved port #s be allowed, but I couldn't
  find it in the RFC.

Modified:
  stable/9/sys/fs/nfsclient/nfs_clvfsops.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/fs/   (props changed)

Modified: stable/9/sys/fs/nfsclient/nfs_clvfsops.c
==============================================================================
--- stable/9/sys/fs/nfsclient/nfs_clvfsops.c	Fri Jul  5 01:21:01 2013	(r252738)
+++ stable/9/sys/fs/nfsclient/nfs_clvfsops.c	Fri Jul  5 01:22:37 2013	(r252739)
@@ -588,12 +588,6 @@ nfs_decode_args(struct mount *mp, struct
 		nmp->nm_flag &= ~NFSMNT_RDIRPLUS;
 	}
 
-	/* Clear NFSMNT_RESVPORT for NFSv4, since it is not required. */
-	if ((argp->flags & NFSMNT_NFSV4) != 0) {
-		argp->flags &= ~NFSMNT_RESVPORT;
-		nmp->nm_flag &= ~NFSMNT_RESVPORT;
-	}
-
 	/* Re-bind if rsrvd port requested and wasn't on one */
 	adjsock = !(nmp->nm_flag & NFSMNT_RESVPORT)
 		  && (argp->flags & NFSMNT_RESVPORT);