Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-31 23:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] knfsd: nfsd4: acls: simplify nfs4_acl_nfsv4_to_posix interface

Browse Source 
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:
J.Bruce Fields 2006-10-04 02:16:13 -07:00 committed by Linus Torvalds
parent b548edc2dd
commit f3b64eb6ef
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
fs/nfsd/nfs4acl.c
View File

@ -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;
}