nfsd4: remove nfs4_acl_new

This is a not-that-useful kmalloc wrapper.  And I'd like one of the
callers to actually use something other than kmalloc.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/nfsd/acl.h b/fs/nfsd/acl.h
index a986ceb6fd0d13b432be3003f57b85a456e2af55..4cd7c69a6cb979c6257f7e87d2576a1fbcdadb8c 100644 (file)
--- a/fs/nfsd/acl.h
+++ b/fs/nfsd/acl.h
@@ -47,7 +47,7 @@ struct svc_rqst;
 #define NFS4_ACL_MAX ((PAGE_SIZE - sizeof(struct nfs4_acl)) \
                        / sizeof(struct nfs4_ace))
 
-struct nfs4_acl *nfs4_acl_new(int);
+int nfs4_acl_bytes(int entries);
 int nfs4_acl_get_whotype(char *, u32);
 __be32 nfs4_acl_write_who(struct xdr_stream *xdr, int who);
 

diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index b0cf00d3ee7d58439b2bdc8f0f24e8cce6a4b970..acf6974e68237be65d7b5a1f65abe973662882b1 100644 (file)
--- a/fs/nfsd/nfs4acl.c
+++ b/fs/nfsd/nfs4acl.c
@@ -161,11 +161,12 @@ nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry,
                        size += 2 * dpacl->a_count;
        }
 
-       *acl = nfs4_acl_new(size);
+       *acl = kmalloc(nfs4_acl_bytes(size), GFP_KERNEL);
        if (*acl == NULL) {
                error = -ENOMEM;
                goto out;
        }
+       (*acl)->naces = 0;
 
        _posix_to_nfsv4_one(pacl, *acl, flags & ~NFS4_ACL_TYPE_DEFAULT);
 
@@ -872,16 +873,13 @@ ace2type(struct nfs4_ace *ace)
        return -1;
 }
 
-struct nfs4_acl *
-nfs4_acl_new(int n)
+/*
+ * return the size of the struct nfs4_acl required to represent an acl
+ * with @entries entries.
+ */
+int nfs4_acl_bytes(int entries)
 {
-       struct nfs4_acl *acl;
-
-       acl = kmalloc(sizeof(*acl) + n*sizeof(struct nfs4_ace), GFP_KERNEL);
-       if (acl == NULL)
-               return NULL;
-       acl->naces = 0;
-       return acl;
+       return sizeof(struct nfs4_acl) + entries * sizeof(struct nfs4_ace);
 }
 
 static struct {

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 8fb0f37182020dac4395c926f7b1cadac7c7b82d..fea41046427cfdc6c165a08d8248852feccc31cb 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -309,7 +309,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
                if (nace > NFS4_ACL_MAX)
                        return nfserr_fbig;
 
-               *acl = nfs4_acl_new(nace);
+               *acl = kmalloc(nfs4_acl_bytes(nace), GFP_KERNEL);
                if (*acl == NULL)
                        return nfserr_jukebox;