1 files changed, 2 insertions, 6 deletions

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 9daa0b9feb8d..ebcf226a9e4a 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -339,8 +339,7 @@ alloc_client(struct xdr_netobj name)
 {
         struct nfs4_client *clp;
 
-        if ((clp = kmalloc(sizeof(struct nfs4_client), GFP_KERNEL))!= NULL) {
-                memset(clp, 0, sizeof(*clp));
+        if ((clp = kzalloc(sizeof(struct nfs4_client), GFP_KERNEL))!= NULL) {
                 if ((clp->cl_name.data = kmalloc(name.len, GFP_KERNEL)) != NULL) {
                         memcpy(clp->cl_name.data, name.data, name.len);
                         clp->cl_name.len = name.len;
@@ -1006,13 +1005,10 @@ alloc_init_file(struct inode *ino)
 static void
 nfsd4_free_slab(kmem_cache_t **slab)
 {
-        int status;
-
         if (*slab == NULL)
                 return;
-        status = kmem_cache_destroy(*slab);
+        kmem_cache_destroy(*slab);
         *slab = NULL;
-        WARN_ON(status);
 }
 
 static void