[PATCH] knfsd: nfsd4: acls: fix handling of zero-length acls

It is legal to have zero-length NFSv4 acls; they just deny everything.

Also, nfs4_acl_nfsv4_to_posix will always return with pacl and dpacl set on
success, so the caller doesn't need to check this.

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>

1 files changed, 1 insertions, 14 deletions

diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index 105544eac9a3..5d94555cdc83 100644
--- a/fs/nfsd/nfs4acl.c
+++ b/fs/nfsd/nfs4acl.c
@@ -357,33 +357,20 @@ nfs4_acl_nfsv4_to_posix(struct nfs4_acl *acl, struct posix_acl **pacl,
                 goto out;
 
         error = nfs4_acl_split(acl, dacl);
-        if (error < 0)
+        if (error)
                 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 (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) {