svn commit: r222540 - head/sys/fs/nfsclient

[Rick Macklem]

Author: rmacklem
Date: Tue May 31 17:43:25 2011
New Revision: 222540
URL: http://svn.freebsd.org/changeset/base/222540

Log:
  Fix the new NFS client so that it doesn't do an NFSv3
  Pathconf RPC for cases where the reply doesn't include
  the answer. This fixes a problem reported by avg@ where
  the NFSv3 Pathconf RPC would fail when "ls -l" did an
  lpathconf(2) for _PC_ACL_NFS4.
  
  Tested by:	avg
  MFC after:	2 weeks

Modified:
  head/sys/fs/nfsclient/nfs_clvnops.c

Modified: head/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvnops.c	Tue May 31 17:34:30 2011	(r222539)
+++ head/sys/fs/nfsclient/nfs_clvnops.c	Tue May 31 17:43:25 2011	(r222540)
@@ -3293,7 +3293,13 @@ nfs_pathconf(struct vop_pathconf_args *a
 	struct thread *td = curthread;
 	int attrflag, error;
 
-	if (NFS_ISV34(vp)) {
+	if (NFS_ISV4(vp) || (NFS_ISV3(vp) && (ap->a_name == _PC_LINK_MAX ||
+	    ap->a_name == _PC_NAME_MAX || ap->a_name == _PC_CHOWN_RESTRICTED ||
+	    ap->a_name == _PC_NO_TRUNC))) {
+		/*
+		 * Since only the above 4 a_names are returned by the NFSv3
+		 * Pathconf RPC, there is no point in doing it for others.
+		 */
 		error = nfsrpc_pathconf(vp, &pc, td->td_ucred, td, &nfsva,
 		    &attrflag, NULL);
 		if (attrflag != 0)
@@ -3302,7 +3308,10 @@ nfs_pathconf(struct vop_pathconf_args *a
 		if (error != 0)
 			return (error);
 	} else {
-		/* For NFSv2, just fake them. */
+		/*
+		 * For NFSv2 (or NFSv3 when not one of the above 4 a_names),
+		 * just fake them.
+		 */
 		pc.pc_linkmax = LINK_MAX;
 		pc.pc_namemax = NFS_MAXNAMLEN;
 		pc.pc_notrunc = 1;