Author: rmacklem
Date: Thu May 24 13:15:15 2012
New Revision: 235910
URL: http://svn.freebsd.org/changeset/base/235910
Log:
MFC: r235568
A problem with the NFSv4 server was reported by Andrew Leonard
to freebsd-fs@, where the setfacl of an NFSv4 acl would fail.
This was caused by the VOP_ACLCHECK() call for ZFS replying
EOPNOTSUPP. After discussion with rwatson@, it was determined
that a call to VOP_ACLCHECK() before doing VOP_SETACL() is not
required. This patch fixes the problem by deleting the
VOP_ACLCHECK() call.
Modified:
stable/8/sys/fs/nfs/nfs_commonacl.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/boot/ (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)
stable/8/sys/dev/e1000/ (props changed)
Modified: stable/8/sys/fs/nfs/nfs_commonacl.c
==============================================================================
--- stable/8/sys/fs/nfs/nfs_commonacl.c Thu May 24 12:45:01 2012
(r235909)
+++ stable/8/sys/fs/nfs/nfs_commonacl.c Thu May 24 13:15:15 2012
(r235910)
@@ -468,9 +468,7 @@ nfsrv_setacl(vnode_t vp, NFSACL_T *aclp,
error = NFSERR_ATTRNOTSUPP;
goto out;
}
- error = VOP_ACLCHECK(vp, ACL_TYPE_NFS4, aclp, cred, p);
- if (!error)
- error = VOP_SETACL(vp, ACL_TYPE_NFS4, aclp, cred, p);
+ error = VOP_SETACL(vp, ACL_TYPE_NFS4, aclp, cred, p);
out:
NFSEXITCODE(error);
_______________________________________________
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"
