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

[safe/jmp/linux-2.6] / fs / nfsd / nfs4acl.c

diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index 105544e..5d94555 100644 (file)
--- 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) {