3 files changed, 5 insertions, 14 deletions

diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c
index f858fef6e41c..fb9e2ee998ae 100644
--- a/fs/dlm/memory.c
+++ b/fs/dlm/memory.c
@@ -39,9 +39,7 @@ char *allocate_lvb(struct dlm_ls *ls)
 {
         char *p;
 
-        p = kmalloc(ls->ls_lvblen, GFP_KERNEL);
-        if (p)
-                memset(p, 0, ls->ls_lvblen);
+        p = kzalloc(ls->ls_lvblen, GFP_KERNEL);
         return p;
 }
 
@@ -59,9 +57,7 @@ struct dlm_rsb *allocate_rsb(struct dlm_ls *ls, int namelen)
 
         DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,);
 
-        r = kmalloc(sizeof(*r) + namelen, GFP_KERNEL);
-        if (r)
-                memset(r, 0, sizeof(*r) + namelen);
+        r = kzalloc(sizeof(*r) + namelen, GFP_KERNEL);
         return r;
 }
 
@@ -101,9 +97,7 @@ struct dlm_direntry *allocate_direntry(struct dlm_ls *ls, int namelen)
         DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,
                    printk("namelen = %d\n", namelen););
 
-        de = kmalloc(sizeof(*de) + namelen, GFP_KERNEL);
-        if (de)
-                memset(de, 0, sizeof(*de) + namelen);
+        de = kzalloc(sizeof(*de) + namelen, GFP_KERNEL);
         return de;
 }
 
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 3eefa97fe204..a6b1072daea7 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -883,13 +883,11 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
                 goto failed_mount;
         }
         bgl_lock_init(&sbi->s_blockgroup_lock);
-        sbi->s_debts = kmalloc(sbi->s_groups_count * sizeof(*sbi->s_debts),
-                               GFP_KERNEL);
+        sbi->s_debts = kcalloc(sbi->s_groups_count, sizeof(*sbi->s_debts), GFP_KERNEL);
         if (!sbi->s_debts) {
                 printk ("EXT2-fs: not enough memory\n");
                 goto failed_mount_group_desc;
         }
-        memset(sbi->s_debts, 0, sbi->s_groups_count * sizeof(*sbi->s_debts));
         for (i = 0; i < db_count; i++) {
                 block = descriptor_loc(sb, logic_sb_block, i);
                 sbi->s_group_desc[i] = sb_bread(sb, block);
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 98e0b85a9bb2..783c57ec07d3 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -372,11 +372,10 @@ void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len,
 {
         struct hd_struct *p;
 
-        p = kmalloc(sizeof(*p), GFP_KERNEL);
+        p = kzalloc(sizeof(*p), GFP_KERNEL);
         if (!p)
                 return;
         
-        memset(p, 0, sizeof(*p));
         p->start_sect = start;
         p->nr_sects = len;
         p->partno = part;