git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
fs
/
ocfs2
/
slot_map.c
diff --git
a/fs/ocfs2/slot_map.c
b/fs/ocfs2/slot_map.c
index
aa6f5aa
..
2d3ac32
100644
(file)
--- a/
fs/ocfs2/slot_map.c
+++ b/
fs/ocfs2/slot_map.c
@@
-175,7
+175,7
@@
int ocfs2_init_slot_info(struct ocfs2_super *osb)
struct buffer_head *bh = NULL;
struct ocfs2_slot_info *si;
- si = k
calloc(1,
sizeof(struct ocfs2_slot_info), GFP_KERNEL);
+ si = k
zalloc(
sizeof(struct ocfs2_slot_info), GFP_KERNEL);
if (!si) {
status = -ENOMEM;
mlog_errno(status);