Merge branch 'ht-delete-2.6.35' into release

[sfrench/cifs-2.6.git] / fs / hfs / bnode.c

diff --git a/fs/hfs/bnode.c b/fs/hfs/bnode.c
index 13231dd5ce660c7ac5e16e476306289b12151c41..cdb41a1f6a646bd957fdfa2cf2b835d2078d9731 100644 (file)
--- a/fs/hfs/bnode.c
+++ b/fs/hfs/bnode.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/pagemap.h>
+#include <linux/slab.h>
 #include <linux/swap.h>
 
 #include "btree.h"
@@ -249,10 +250,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);