svn commit: r217679 - stable/8/sys/fs/nfs

[Rick Macklem]

Author: rmacklem
Date: Fri Jan 21 01:24:00 2011
New Revision: 217679
URL: http://svn.freebsd.org/changeset/base/217679

Log:
  MFC: r217535
  Fix the experimental NFSv4 server so that it uses VOP_ACCESSX()
  to check for VREAD_ACL instead of VOP_ACCESS().

Modified:
  stable/8/sys/fs/nfs/nfs_commonsubs.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- stable/8/sys/fs/nfs/nfs_commonsubs.c	Fri Jan 21 01:12:22 2011	(r217678)
+++ stable/8/sys/fs/nfs/nfs_commonsubs.c	Fri Jan 21 01:24:00 2011	(r217679)
@@ -2002,7 +2002,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd
 #ifdef NFS4_ACL_EXTATTR_NAME
 		} else if (naclp != NULL) {
 			if (vn_lock(vp, LK_SHARED) == 0) {
-				error = VOP_ACCESS(vp, VREAD_ACL, cred, p);
+				error = VOP_ACCESSX(vp, VREAD_ACL, cred, p);
 				if (error == 0)
 					error = VOP_GETACL(vp, ACL_TYPE_NFS4,
 					    naclp, cred, p);