diff options
| author | rmacklem <rmacklem@FreeBSD.org> | 2009-05-26 22:21:53 +0000 |
|---|---|---|
| committer | rmacklem <rmacklem@FreeBSD.org> | 2009-05-26 22:21:53 +0000 |
| commit | c1143c05d4831dacf62ba759cf7b9fa4fbdca19d (patch) | |
| tree | 7e7b81794b65ee6fd6f5bb6519bac76cf80722d6 /sys/fs/nfs/nfs_commonsubs.c | |
| parent | 527dd575556c8d79007e7a35cd752f1b46343fd2 (diff) | |
| download | FreeBSD-src-c1143c05d4831dacf62ba759cf7b9fa4fbdca19d.zip FreeBSD-src-c1143c05d4831dacf62ba759cf7b9fa4fbdca19d.tar.gz | |
Fix the experimental nfs subsystem so that it builds with the
current NFSv4 ACLs, as defined in sys/acl.h. It still needs a
way to test a mount point for NFSv4 ACL support before it will
work. Until then, the NFSHASNFS4ACL() macro just always returns 0.
Approved by: kib (mentor)
Diffstat (limited to 'sys/fs/nfs/nfs_commonsubs.c')
| -rw-r--r-- | sys/fs/nfs/nfs_commonsubs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index a398a72..b1a7051 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -1018,7 +1018,7 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, if (nfsrv_useacl) { NFSACL_T *naclp; - naclp = acl_alloc(); + naclp = acl_alloc(M_WAITOK); error = nfsrv_dissectacl(nd, naclp, &aceerr, &cnt, p); if (error) { @@ -1933,7 +1933,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, vnode_t vp, NFSACL_T *saclp, } else { NFSCLRNOTFILLABLE_ATTRBIT(retbitp); #ifdef NFS4_ACL_EXTATTR_NAME - naclp = acl_alloc(); + naclp = acl_alloc(M_WAITOK); #endif aclp = naclp; } |
