diff options
| author | rmacklem <rmacklem@FreeBSD.org> | 2012-05-17 21:52:17 +0000 |
|---|---|---|
| committer | rmacklem <rmacklem@FreeBSD.org> | 2012-05-17 21:52:17 +0000 |
| commit | 568f30221478a4cada8913ab09a05c97a1c7ed92 (patch) | |
| tree | 2a4a44382fe600c46264166ad72dee85059585c9 | |
| parent | 61ebbeb1e130c2a1a8cdab44f3f0baf5f5568ede (diff) | |
| download | FreeBSD-src-568f30221478a4cada8913ab09a05c97a1c7ed92.zip FreeBSD-src-568f30221478a4cada8913ab09a05c97a1c7ed92.tar.gz | |
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
| -rw-r--r-- | sys/fs/nfs/nfs_commonacl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/fs/nfs/nfs_commonacl.c b/sys/fs/nfs/nfs_commonacl.c index 1d731c5..886e582 100644 --- a/sys/fs/nfs/nfs_commonacl.c +++ b/sys/fs/nfs/nfs_commonacl.c @@ -468,9 +468,7 @@ nfsrv_setacl(vnode_t vp, NFSACL_T *aclp, struct ucred *cred, 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); |
