aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext3
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext3')
-rw-r--r--fs/ext3/dir.c3
-rw-r--r--fs/ext3/super.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c
index 4d97f437cd48..429acbb4e064 100644
--- a/fs/ext3/dir.c
+++ b/fs/ext3/dir.c
@@ -343,10 +343,9 @@ int ext3_htree_store_dirent(struct file *dir_file, __u32 hash,
343 343
344 /* Create and allocate the fname structure */ 344 /* Create and allocate the fname structure */
345 len = sizeof(struct fname) + dirent->name_len + 1; 345 len = sizeof(struct fname) + dirent->name_len + 1;
346 new_fn = kmalloc(len, GFP_KERNEL); 346 new_fn = kzalloc(len, GFP_KERNEL);
347 if (!new_fn) 347 if (!new_fn)
348 return -ENOMEM; 348 return -ENOMEM;
349 memset(new_fn, 0, len);
350 new_fn->hash = hash; 349 new_fn->hash = hash;
351 new_fn->minor_hash = minor_hash; 350 new_fn->minor_hash = minor_hash;
352 new_fn->inode = le32_to_cpu(dirent->inode); 351 new_fn->inode = le32_to_cpu(dirent->inode);
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 10985017765b..09b4b313ca07 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1407,11 +1407,10 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
1407 int needs_recovery; 1407 int needs_recovery;
1408 __le32 features; 1408 __le32 features;
1409 1409
1410 sbi = kmalloc(sizeof(*sbi), GFP_KERNEL); 1410 sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
1411 if (!sbi) 1411 if (!sbi)
1412 return -ENOMEM; 1412 return -ENOMEM;
1413 sb->s_fs_info = sbi; 1413 sb->s_fs_info = sbi;
1414 memset(sbi, 0, sizeof(*sbi));
1415 sbi->s_mount_opt = 0; 1414 sbi->s_mount_opt = 0;
1416 sbi->s_resuid = EXT3_DEF_RESUID; 1415 sbi->s_resuid = EXT3_DEF_RESUID;
1417 sbi->s_resgid = EXT3_DEF_RESGID; 1416 sbi->s_resgid = EXT3_DEF_RESGID;