diff options
Diffstat (limited to 'fs/hfs')
-rw-r--r-- | fs/hfs/bnode.c | 3 | ||||
-rw-r--r-- | fs/hfs/btree.c | 3 | ||||
-rw-r--r-- | fs/hfs/super.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/fs/hfs/bnode.c b/fs/hfs/bnode.c index 13231dd5ce66..0d200068d0af 100644 --- a/fs/hfs/bnode.c +++ b/fs/hfs/bnode.c | |||
@@ -249,10 +249,9 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid) | |||
249 | sb = tree->inode->i_sb; | 249 | sb = tree->inode->i_sb; |
250 | size = sizeof(struct hfs_bnode) + tree->pages_per_bnode * | 250 | size = sizeof(struct hfs_bnode) + tree->pages_per_bnode * |
251 | sizeof(struct page *); | 251 | sizeof(struct page *); |
252 | node = kmalloc(size, GFP_KERNEL); | 252 | node = kzalloc(size, GFP_KERNEL); |
253 | if (!node) | 253 | if (!node) |
254 | return NULL; | 254 | return NULL; |
255 | memset(node, 0, size); | ||
256 | node->tree = tree; | 255 | node->tree = tree; |
257 | node->this = cnid; | 256 | node->this = cnid; |
258 | set_bit(HFS_BNODE_NEW, &node->flags); | 257 | set_bit(HFS_BNODE_NEW, &node->flags); |
diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c index 400357994319..5fd0ed71f923 100644 --- a/fs/hfs/btree.c +++ b/fs/hfs/btree.c | |||
@@ -21,10 +21,9 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke | |||
21 | struct page *page; | 21 | struct page *page; |
22 | unsigned int size; | 22 | unsigned int size; |
23 | 23 | ||
24 | tree = kmalloc(sizeof(*tree), GFP_KERNEL); | 24 | tree = kzalloc(sizeof(*tree), GFP_KERNEL); |
25 | if (!tree) | 25 | if (!tree) |
26 | return NULL; | 26 | return NULL; |
27 | memset(tree, 0, sizeof(*tree)); | ||
28 | 27 | ||
29 | init_MUTEX(&tree->tree_lock); | 28 | init_MUTEX(&tree->tree_lock); |
30 | spin_lock_init(&tree->hash_lock); | 29 | spin_lock_init(&tree->hash_lock); |
diff --git a/fs/hfs/super.c b/fs/hfs/super.c index 34937ee83ab1..05dffff1a372 100644 --- a/fs/hfs/super.c +++ b/fs/hfs/super.c | |||
@@ -356,11 +356,10 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent) | |||
356 | struct inode *root_inode; | 356 | struct inode *root_inode; |
357 | int res; | 357 | int res; |
358 | 358 | ||
359 | sbi = kmalloc(sizeof(struct hfs_sb_info), GFP_KERNEL); | 359 | sbi = kzalloc(sizeof(struct hfs_sb_info), GFP_KERNEL); |
360 | if (!sbi) | 360 | if (!sbi) |
361 | return -ENOMEM; | 361 | return -ENOMEM; |
362 | sb->s_fs_info = sbi; | 362 | sb->s_fs_info = sbi; |
363 | memset(sbi, 0, sizeof(struct hfs_sb_info)); | ||
364 | INIT_HLIST_HEAD(&sbi->rsrc_inodes); | 363 | INIT_HLIST_HEAD(&sbi->rsrc_inodes); |
365 | 364 | ||
366 | res = -EINVAL; | 365 | res = -EINVAL; |