git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfs2
[pandora-kernel.git]
/
fs
/
hfsplus
/
bnode.c
diff --git
a/fs/hfsplus/bnode.c
b/fs/hfsplus/bnode.c
index
77bf434
..
29da657
100644
(file)
--- a/
fs/hfsplus/bnode.c
+++ b/
fs/hfsplus/bnode.c
@@
-409,10
+409,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 *);
sb = tree->inode->i_sb;
size = sizeof(struct hfs_bnode) + tree->pages_per_bnode *
sizeof(struct page *);
- node = k
m
alloc(size, GFP_KERNEL);
+ node = k
z
alloc(size, GFP_KERNEL);
if (!node)
return NULL;
if (!node)
return NULL;
- memset(node, 0, size);
node->tree = tree;
node->this = cnid;
set_bit(HFS_BNODE_NEW, &node->flags);
node->tree = tree;
node->this = cnid;
set_bit(HFS_BNODE_NEW, &node->flags);