Merge branch 'master' into gfs2

1 files changed, 1 insertions, 2 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)
         sb = tree->inode->i_sb;
         size = sizeof(struct hfs_bnode) + tree->pages_per_bnode *
                 sizeof(struct page *);
-        node = kmalloc(size, GFP_KERNEL);
+        node = kzalloc(size, GFP_KERNEL);
         if (!node)
                 return NULL;
-        memset(node, 0, size);
         node->tree = tree;
         node->this = cnid;
         set_bit(HFS_BNODE_NEW, &node->flags);