@@ -51,7 +51,7 @@ struct svc_rqst;
__be32 nfsd4_decode_ace_who(struct richace *ace, struct svc_rqst *rqstp,
char *who, u32 len);
__be32 nfsd4_encode_ace_who(struct xdr_stream *xdr, struct svc_rqst *rqstp,
- struct richace *ace);
+ struct richace *ace, struct richacl *acl);
struct richacl *nfsd4_get_acl(struct svc_rqst *rqstp, struct dentry *dentry);
__be32 nfsd4_set_acl(struct svc_rqst *rqstp, struct svc_fh *fhp,
@@ -885,17 +885,22 @@ __be32 nfsd4_decode_ace_who(struct richace *ace, struct svc_rqst *rqstp,
}
__be32 nfsd4_encode_ace_who(struct xdr_stream *xdr, struct svc_rqst *rqstp,
- struct richace *ace)
+ struct richace *ace, struct richacl *acl)
{
- if (ace->e_flags & RICHACE_SPECIAL_WHO) {
- unsigned int special_id = ace->e_id.special;
+ if (ace->e_flags & (RICHACE_SPECIAL_WHO | RICHACE_UNMAPPED_WHO)) {
const char *who;
unsigned int len;
__be32 *p;
- if (!nfs4acl_special_id_to_who(special_id, &who, &len)) {
- WARN_ON_ONCE(1);
- return nfserr_serverfault;
+ if (ace->e_flags & RICHACE_SPECIAL_WHO) {
+ if (!nfs4acl_special_id_to_who(ace->e_id.special,
+ &who, &len)) {
+ WARN_ON_ONCE(1);
+ return nfserr_serverfault;
+ }
+ } else {
+ who = richace_unmapped_identifier(ace, acl);
+ len = strlen(who);
}
p = xdr_reserve_space(xdr, len + 4);
if (!p)
@@ -2325,7 +2325,7 @@ static __be32 nfsd4_encode_acl_entries(struct xdr_stream *xdr,
{
__be32 *p;
- flags_mask &= ~RICHACE_SPECIAL_WHO;
+ flags_mask &= ~(RICHACE_SPECIAL_WHO | RICHACE_UNMAPPED_WHO);
p = xdr_reserve_space(xdr, 4);
if (!p)
@@ -2347,7 +2347,7 @@ static __be32 nfsd4_encode_acl_entries(struct xdr_stream *xdr,
*p++ = cpu_to_be32(ace->e_type);
*p++ = cpu_to_be32(ace->e_flags & flags_mask);
*p++ = cpu_to_be32(ace->e_mask & ace_mask);
- status = nfsd4_encode_ace_who(xdr, rqstp, ace);
+ status = nfsd4_encode_ace_who(xdr, rqstp, ace, acl);
if (status)
return status;
}
Add support for encoding unmapped identifiers in richacl entries: local filesystems are not usually supposed to store unmapped identifiers, but allowing that for debugging purposes can be useful; for that, nfsd must also be able to encode them. Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> --- fs/nfsd/acl.h | 2 +- fs/nfsd/nfs4acl.c | 17 +++++++++++------ fs/nfsd/nfs4xdr.c | 4 ++-- 3 files changed, 14 insertions(+), 9 deletions(-)