mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
[PATCH] knfsd: nfsd4: acls: simplify nfs4_acl_nfsv4_to_posix interface
There's no need to handle the case where the caller passes in null for pacl or dpacl; no caller does that, because it would be a dumb thing to do. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
b548edc2dd
commit
f3b64eb6ef
1 changed files with 21 additions and 27 deletions
|
@ -360,39 +360,33 @@ nfs4_acl_nfsv4_to_posix(struct nfs4_acl *acl, struct posix_acl **pacl,
|
|||
if (error < 0)
|
||||
goto out_acl;
|
||||
|
||||
if (pacl != NULL) {
|
||||
if (acl->naces == 0) {
|
||||
error = -ENODATA;
|
||||
goto try_dpacl;
|
||||
}
|
||||
|
||||
*pacl = _nfsv4_to_posix_one(acl, flags);
|
||||
if (IS_ERR(*pacl)) {
|
||||
error = PTR_ERR(*pacl);
|
||||
*pacl = NULL;
|
||||
goto out_acl;
|
||||
}
|
||||
if (acl->naces == 0) {
|
||||
error = -ENODATA;
|
||||
goto try_dpacl;
|
||||
}
|
||||
|
||||
*pacl = _nfsv4_to_posix_one(acl, flags);
|
||||
if (IS_ERR(*pacl)) {
|
||||
error = PTR_ERR(*pacl);
|
||||
*pacl = NULL;
|
||||
goto out_acl;
|
||||
}
|
||||
try_dpacl:
|
||||
if (dpacl != NULL) {
|
||||
if (dacl->naces == 0) {
|
||||
if (pacl == NULL || *pacl == NULL)
|
||||
error = -ENODATA;
|
||||
goto out_acl;
|
||||
}
|
||||
|
||||
error = 0;
|
||||
*dpacl = _nfsv4_to_posix_one(dacl, flags);
|
||||
if (IS_ERR(*dpacl)) {
|
||||
error = PTR_ERR(*dpacl);
|
||||
*dpacl = NULL;
|
||||
goto out_acl;
|
||||
}
|
||||
if (dacl->naces == 0) {
|
||||
if (pacl == NULL || *pacl == NULL)
|
||||
error = -ENODATA;
|
||||
goto out_acl;
|
||||
}
|
||||
|
||||
error = 0;
|
||||
*dpacl = _nfsv4_to_posix_one(dacl, flags);
|
||||
if (IS_ERR(*dpacl)) {
|
||||
error = PTR_ERR(*dpacl);
|
||||
*dpacl = NULL;
|
||||
goto out_acl;
|
||||
}
|
||||
out_acl:
|
||||
if (error && pacl) {
|
||||
if (error) {
|
||||
posix_acl_release(*pacl);
|
||||
*pacl = NULL;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue