Author: rmacklem
Date: Fri May 9 00:19:08 2014
New Revision: 265721
URL: http://svnweb.freebsd.org/changeset/base/265721
Log:
MFC: r264842
Modify the NFSv4 client's Pathconf RPC (actually a Getattr Op.)
so that it only does the RPC for names that are answered by the RPC.
Doing the RPC for other names is harmless, but unnecessary.
Modified:
stable/9/sys/fs/nfsclient/nfs_clvnops.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/fs/ (props changed)
Modified: stable/9/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- stable/9/sys/fs/nfsclient/nfs_clvnops.c Thu May 8 23:54:15 2014
(r265720)
+++ stable/9/sys/fs/nfsclient/nfs_clvnops.c Fri May 9 00:19:08 2014
(r265721)
@@ -3405,12 +3405,15 @@ nfs_pathconf(struct vop_pathconf_args *a
struct thread *td = curthread;
int attrflag, error;
- if (NFS_ISV4(vp) || (NFS_ISV3(vp) && (ap->a_name == _PC_LINK_MAX ||
+ if ((NFS_ISV34(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))) {
+ ap->a_name == _PC_NO_TRUNC)) ||
+ (NFS_ISV4(vp) && ap->a_name == _PC_ACL_NFS4)) {
/*
* Since only the above 4 a_names are returned by the NFSv3
* Pathconf RPC, there is no point in doing it for others.
+ * For NFSv4, the Pathconf RPC (actually a Getattr Op.) can
+ * be used for _PC_NFS4_ACL as well.
*/
error = nfsrpc_pathconf(vp, &pc, td->td_ucred, td, &nfsva,
&attrflag, NULL);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
