svn commit: r235906 - stable/9/sys/fs/nfs

[Rick Macklem]

Author: rmacklem
Date: Thu May 24 12:28:11 2012
New Revision: 235906
URL: http://svn.freebsd.org/changeset/base/235906

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/9/sys/fs/nfs/nfs_commonacl.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/dev/   (props changed)
  stable/9/sys/dev/e1000/   (props changed)
  stable/9/sys/dev/ixgbe/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/modules/   (props changed)

Modified: stable/9/sys/fs/nfs/nfs_commonacl.c
==============================================================================
--- stable/9/sys/fs/nfs/nfs_commonacl.c	Thu May 24 12:27:27 2012	(r235905)
+++ stable/9/sys/fs/nfs/nfs_commonacl.c	Thu May 24 12:28:11 2012	(r235906)
@@ -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);