Messages in this thread Patches in this message | | | From | NeilBrown <> | Date | Mon, 3 Apr 2006 15:18:18 +1000 | Subject | [PATCH 003 of 16] knfsd: nfsd4: better nfs4acl errors |
| |
We're returning -1 in a few places in the NFSv4<->POSIX acl translation code where we could return a reasonable error.
Also allows some minor simplification elsewhere.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@suse.de>
### Diffstat output ./fs/nfsd/nfs4acl.c | 6 +++--- ./fs/nfsd/nfs4xdr.c | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-)
diff ./fs/nfsd/nfs4acl.c~current~ ./fs/nfsd/nfs4acl.c --- ./fs/nfsd/nfs4acl.c~current~ 2006-04-03 15:12:05.000000000 +1000 +++ ./fs/nfsd/nfs4acl.c 2006-04-03 15:12:06.000000000 +1000 @@ -710,9 +710,9 @@ calculate_posix_ace_count(struct nfs4_ac /* Also, the remaining entries are for named users and * groups, and come in threes (mask, allow, deny): */ if (n4acl->naces < 7) - return -1; + return -EINVAL; if ((n4acl->naces - 7) % 3) - return -1; + return -EINVAL; return 4 + (n4acl->naces - 7)/3; } } @@ -866,7 +866,7 @@ nfs4_acl_add_ace(struct nfs4_acl *acl, u struct nfs4_ace *ace; if ((ace = kmalloc(sizeof(*ace), GFP_KERNEL)) == NULL) - return -1; + return -ENOMEM; ace->type = type; ace->flag = flag; diff ./fs/nfsd/nfs4xdr.c~current~ ./fs/nfsd/nfs4xdr.c --- ./fs/nfsd/nfs4xdr.c~current~ 2006-04-03 15:12:06.000000000 +1000 +++ ./fs/nfsd/nfs4xdr.c 2006-04-03 15:12:06.000000000 +1000 @@ -299,11 +299,10 @@ nfsd4_decode_fattr(struct nfsd4_compound buf, dummy32, &ace.who); if (status) goto out_nfserr; - if (nfs4_acl_add_ace(*acl, ace.type, ace.flag, - ace.access_mask, ace.whotype, ace.who) != 0) { - status = -ENOMEM; + status = nfs4_acl_add_ace(*acl, ace.type, ace.flag, + ace.access_mask, ace.whotype, ace.who); + if (status) goto out_nfserr; - } } } else *acl = NULL; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |