3 files changed, 3 insertions, 7 deletions

diff --git a/fs/affs/bitmap.c b/fs/affs/bitmap.c
index b0b953683c1a..b330009fe42d 100644
--- a/fs/affs/bitmap.c
+++ b/fs/affs/bitmap.c
@@ -289,12 +289,11 @@ int affs_init_bitmap(struct super_block *sb, int *flags)
         sbi->s_bmap_count = (sbi->s_partition_size - sbi->s_reserved +
                                  sbi->s_bmap_bits - 1) / sbi->s_bmap_bits;
         size = sbi->s_bmap_count * sizeof(*bm);
-        bm = sbi->s_bitmap = kmalloc(size, GFP_KERNEL);
+        bm = sbi->s_bitmap = kzalloc(size, GFP_KERNEL);
         if (!sbi->s_bitmap) {
                 printk(KERN_ERR "AFFS: Bitmap allocation failed\n");
                 return -ENOMEM;
         }
-        memset(sbi->s_bitmap, 0, size);
 
         bmap_blk = (__be32 *)sbi->s_root_bh->b_data;
         blk = sb->s_blocksize / 4 - 49;
diff --git a/fs/afs/server.c b/fs/afs/server.c
index 22afaae1a4ce..44aff81dc6a7 100644
--- a/fs/afs/server.c
+++ b/fs/afs/server.c
@@ -55,13 +55,12 @@ int afs_server_lookup(struct afs_cell *cell, const struct in_addr *addr,
         _enter("%p,%08x,", cell, ntohl(addr->s_addr));
 
         /* allocate and initialise a server record */
-        server = kmalloc(sizeof(struct afs_server), GFP_KERNEL);
+        server = kzalloc(sizeof(struct afs_server), GFP_KERNEL);
         if (!server) {
                 _leave(" = -ENOMEM");
                 return -ENOMEM;
         }
 
-        memset(server, 0, sizeof(struct afs_server));
         atomic_set(&server->usage, 1);
 
         INIT_LIST_HEAD(&server->link);
diff --git a/fs/afs/super.c b/fs/afs/super.c
index 9a351c4c7564..18d9b77ba40f 100644
--- a/fs/afs/super.c
+++ b/fs/afs/super.c
@@ -242,14 +242,12 @@ static int afs_fill_super(struct super_block *sb, void *data, int silent)
         kenter("");
 
         /* allocate a superblock info record */
-        as = kmalloc(sizeof(struct afs_super_info), GFP_KERNEL);
+        as = kzalloc(sizeof(struct afs_super_info), GFP_KERNEL);
         if (!as) {
                 _leave(" = -ENOMEM");
                 return -ENOMEM;
         }
 
-        memset(as, 0, sizeof(struct afs_super_info));
-
         afs_get_volume(params->volume);
         as->volume = params->volume;