projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[powerpc.git]
/
fs
/
ocfs2
/
alloc.c
diff --git
a/fs/ocfs2/alloc.c
b/fs/ocfs2/alloc.c
index
edc91ca
..
f27e537
100644
(file)
--- a/
fs/ocfs2/alloc.c
+++ b/
fs/ocfs2/alloc.c
@@
-1959,7
+1959,7
@@
int ocfs2_prepare_truncate(struct ocfs2_super *osb,
goto bail;
}
- *tc = k
calloc(1,
sizeof(struct ocfs2_truncate_context), GFP_KERNEL);
+ *tc = k
zalloc(
sizeof(struct ocfs2_truncate_context), GFP_KERNEL);
if (!(*tc)) {
status = -ENOMEM;
mlog_errno(status);