projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ocfs2
/
slot_map.c
diff --git
a/fs/ocfs2/slot_map.c
b/fs/ocfs2/slot_map.c
index 1424c151cccce0170819ce4e0f36dad7d97461b8..a88b2a4fcc85171210cd17f8e4f9a791d5aa1d2b 100644
(file)
--- a/
fs/ocfs2/slot_map.c
+++ b/
fs/ocfs2/slot_map.c
@@
-382,7
+382,7
@@
static int ocfs2_map_slot_buffers(struct ocfs2_super *osb,
trace_ocfs2_map_slot_buffers(bytes, si->si_blocks);
- si->si_bh = k
zalloc(sizeof(struct buffer_head *) * si->si_blocks
,
+ si->si_bh = k
calloc(si->si_blocks, sizeof(struct buffer_head *)
,
GFP_KERNEL);
if (!si->si_bh) {
status = -ENOMEM;