[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>

fs/nfsd/nfs4acl.c

@@ -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 @@ nfs4_acl_nfsv4_to_posix(struct nfs4_acl *acl, struct posix_acl **pacl,
 		*dpacl = NULL;
 		goto out_acl;
 	}
-	}
-
 out_acl:
-	if (error && pacl) {
+	if (error) {
 		posix_acl_release(*pacl);
 		*pacl = NULL;
 	}