svn commit: r356239 - stable/11/sys/fs/nfsclient

[Rick Macklem]

Author: rmacklem
Date: Tue Dec 31 18:28:25 2019
New Revision: 356239
URL: https://svnweb.freebsd.org/changeset/base/356239

Log:
  MFC: r356066
  Fix nfsmount() so that it will return NFSERR_MINORVERMISMATCH.
  
  If nfsrpc_getdirpath() returns NFSERR_MINORVERMISMATCH, it would erroneously
  get mapped to EIO. This was not particularily harmful, but would make it
  hard for sysadmins to diagnose why an NFSv4 mount is failing.
  
  mount_nfs.c still needs to be fixed so that it does not report
  NFSERR_MINORVERMISMATCH as an unknown error 10021.

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

Modified: stable/11/sys/fs/nfsclient/nfs_clvfsops.c
==============================================================================
--- stable/11/sys/fs/nfsclient/nfs_clvfsops.c	Tue Dec 31 18:10:34 2019	(r356238)
+++ stable/11/sys/fs/nfsclient/nfs_clvfsops.c	Tue Dec 31 18:28:25 2019	(r356239)
@@ -1541,10 +1541,8 @@ mountnfs(struct nfs_args *argp, struct mount *mp, stru
 			if (error)
 				(void) nfs_catnap(PZERO, error, "nfsgetdirp");
 		} while (error && --trycnt > 0);
-		if (error) {
-			error = nfscl_maperr(td, error, (uid_t)0, (gid_t)0);
+		if (error)
 			goto bad;
-		}
 	}
 
 	/*