Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 1 insertions, 2 deletions

diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
index 6100bbe27432..f90d70475854 100644
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
@@ -66,14 +66,13 @@ nfsd_cache_init(void)
                 printk (KERN_ERR "nfsd: cannot allocate all %d cache entries, only got %d\n",
                         CACHESIZE, CACHESIZE-i);
 
-        hash_list = kmalloc (HASHSIZE * sizeof(struct hlist_head), GFP_KERNEL);
+        hash_list = kcalloc (HASHSIZE, sizeof(struct hlist_head), GFP_KERNEL);
         if (!hash_list) {
                 nfsd_cache_shutdown();
                 printk (KERN_ERR "nfsd: cannot allocate %Zd bytes for hash list\n",
                         HASHSIZE * sizeof(struct hlist_head));
                 return;
         }
-        memset(hash_list, 0, HASHSIZE * sizeof(struct hlist_head));
 
         cache_disabled = 0;
 }