diff options
| author | Christoph Hellwig | 2013-12-20 14:16:55 +0100 |
|---|---|---|
| committer | Al Viro | 2014-01-26 14:26:41 +0100 |
| commit | 4ac7249ea5a0ceef9f8269f63f33cc873c3fac61 (patch) | |
| tree | f12c9d14720d981270c45b207748e215f7a3dca3 /fs/nfsd/acl.h | |
| parent | fs: remove generic_acl (diff) | |
| download | kernel-qcow2-linux-4ac7249ea5a0ceef9f8269f63f33cc873c3fac61.tar.gz kernel-qcow2-linux-4ac7249ea5a0ceef9f8269f63f33cc873c3fac61.tar.xz kernel-qcow2-linux-4ac7249ea5a0ceef9f8269f63f33cc873c3fac61.zip | |
nfsd: use get_acl and ->set_acl
Remove the boilerplate code to marshall and unmarhall ACL objects into
xattrs and operate on the posix_acl objects directly. Also move all
the ACL handling code into nfs?acl.c where it belongs.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfsd/acl.h')
| -rw-r--r-- | fs/nfsd/acl.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/fs/nfsd/acl.h b/fs/nfsd/acl.h index 8b186a4955cc..8b68218e2c1c 100644 --- a/fs/nfsd/acl.h +++ b/fs/nfsd/acl.h @@ -35,7 +35,9 @@ #ifndef LINUX_NFS4_ACL_H #define LINUX_NFS4_ACL_H -#include <linux/posix_acl.h> +struct nfs4_acl; +struct svc_fh; +struct svc_rqst; /* Maximum ACL we'll accept from client; chosen (somewhat arbitrarily) to * fit in a page: */ @@ -45,13 +47,9 @@ struct nfs4_acl *nfs4_acl_new(int); int nfs4_acl_get_whotype(char *, u32); int nfs4_acl_write_who(int who, char *p); -#define NFS4_ACL_TYPE_DEFAULT 0x01 -#define NFS4_ACL_DIR 0x02 -#define NFS4_ACL_OWNER 0x04 - -struct nfs4_acl *nfs4_acl_posix_to_nfsv4(struct posix_acl *, - struct posix_acl *, unsigned int flags); -int nfs4_acl_nfsv4_to_posix(struct nfs4_acl *, struct posix_acl **, - struct posix_acl **, unsigned int flags); +int nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry, + struct nfs4_acl **acl); +__be32 nfsd4_set_nfs4_acl(struct svc_rqst *rqstp, struct svc_fh *fhp, + struct nfs4_acl *acl); #endif /* LINUX_NFS4_ACL_H */ |