svn commit: r235568 - head/sys/fs/nfs

[Rick Macklem]

Author: rmacklem
Date: Thu May 17 21:52:17 2012
New Revision: 235568
URL: http://svn.freebsd.org/changeset/base/235568

Log:
  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.
  
  Tested by:	Andrew Leonard (previous version)
  MFC after:	1 week

Modified:
  head/sys/fs/nfs/nfs_commonacl.c

Modified: head/sys/fs/nfs/nfs_commonacl.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonacl.c	Thu May 17 20:49:44 2012	(r235567)
+++ head/sys/fs/nfs/nfs_commonacl.c	Thu May 17 21:52:17 2012	(r235568)
@@ -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);