projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'overflow-v4.18-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
fs
/
nfs
/
flexfilelayout
/
flexfilelayout.c
diff --git
a/fs/nfs/flexfilelayout/flexfilelayout.c
b/fs/nfs/flexfilelayout/flexfilelayout.c
index
3ae038d
..
d4a07ac
100644
(file)
--- a/
fs/nfs/flexfilelayout/flexfilelayout.c
+++ b/
fs/nfs/flexfilelayout/flexfilelayout.c
@@
-461,7
+461,7
@@
ff_layout_alloc_lseg(struct pnfs_layout_hdr *lh,
fh_count = be32_to_cpup(p);
fls->mirror_array[i]->fh_versions =
- k
zalloc(fh_count *
sizeof(struct nfs_fh),
+ k
calloc(fh_count,
sizeof(struct nfs_fh),
gfp_flags);
if (fls->mirror_array[i]->fh_versions == NULL) {
rc = -ENOMEM;