diff options
| author | rmacklem <rmacklem@FreeBSD.org> | 2011-04-14 23:46:15 +0000 |
|---|---|---|
| committer | rmacklem <rmacklem@FreeBSD.org> | 2011-04-14 23:46:15 +0000 |
| commit | 42cdb57de6abf64c210a8803e255316b862633a8 (patch) | |
| tree | e5f9c4eded45dce4197320c137ba3aaab730b04e /sys/fs/nfs/nfs_commonacl.c | |
| parent | 5e701afcf0ad5097517625cc499c5575008471a4 (diff) | |
| download | FreeBSD-src-42cdb57de6abf64c210a8803e255316b862633a8.zip FreeBSD-src-42cdb57de6abf64c210a8803e255316b862633a8.tar.gz | |
Fix the experimental NFSv4 server so that it uses VOP_PATHCONF()
to determine if a file system supports NFSv4 ACLs. Since
VOP_PATHCONF() must be called with a locked vnode, the function
is called before nfsvno_fillattr() and the result is passed in
as an extra argument.
MFC after: 2 weeks
Diffstat (limited to 'sys/fs/nfs/nfs_commonacl.c')
| -rw-r--r-- | sys/fs/nfs/nfs_commonacl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/fs/nfs/nfs_commonacl.c b/sys/fs/nfs/nfs_commonacl.c index 910a6a4..c4875d8 100644 --- a/sys/fs/nfs/nfs_commonacl.c +++ b/sys/fs/nfs/nfs_commonacl.c @@ -445,7 +445,7 @@ nfsrv_setacl(vnode_t vp, NFSACL_T *aclp, struct ucred *cred, { int error; - if (nfsrv_useacl == 0 || !NFSHASNFS4ACL(vnode_mount(vp))) + if (nfsrv_useacl == 0 || nfs_supportsnfsv4acls(vp) == 0) return (NFSERR_ATTRNOTSUPP); /* * With NFSv4 ACLs, chmod(2) may need to add additional entries. |
