public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[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

8
fs/nfsd/nfs4acl.c
View file

@ -360,7 +360,6 @@ 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;
@ -372,10 +371,7 @@ nfs4_acl_nfsv4_to_posix(struct nfs4_acl *acl, struct posix_acl **pacl,
*pacl = NULL;
goto out_acl;
}
}
try_dpacl:
if (dpacl != NULL) {
if (dacl->naces == 0) {
if (pacl == NULL || *pacl == NULL)
error = -ENODATA;
@ -389,10 +385,8 @@ try_dpacl:
*dpacl = NULL;
goto out_acl;
}
}
out_acl:
if (error && pacl) {
if (error) {
posix_acl_release(*pacl);
*pacl = NULL;
}