diff options
author | Colin Ian King <colin.king@canonical.com> | 2018-01-26 14:42:47 -0500 |
---|---|---|
committer | Mike Marshall <hubcap@omnibond.com> | 2018-04-02 08:10:17 -0400 |
commit | 81e3d0253f87d369a1d957eb3173fd596126383c (patch) | |
tree | 5248677e2d0f3df505bc85bb3f8f70fa6b103746 | |
parent | c2676ef801f50cc759d205a89adbf733c798d052 (diff) |
orangefs: replace vmalloc and memset with vzalloc
Use vzalloc instead of the vmalloc, memset combo
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
-rw-r--r-- | fs/orangefs/devorangefs-req.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/orangefs/devorangefs-req.c b/fs/orangefs/devorangefs-req.c index b03057afac2a..319cf9dcacdd 100644 --- a/fs/orangefs/devorangefs-req.c +++ b/fs/orangefs/devorangefs-req.c | |||
@@ -463,11 +463,10 @@ static ssize_t orangefs_devreq_write_iter(struct kiocb *iocb, | |||
463 | if (op->downcall.type != ORANGEFS_VFS_OP_READDIR) | 463 | if (op->downcall.type != ORANGEFS_VFS_OP_READDIR) |
464 | goto wakeup; | 464 | goto wakeup; |
465 | 465 | ||
466 | op->downcall.trailer_buf = vmalloc(op->downcall.trailer_size); | 466 | op->downcall.trailer_buf = vzalloc(op->downcall.trailer_size); |
467 | if (!op->downcall.trailer_buf) | 467 | if (!op->downcall.trailer_buf) |
468 | goto Enomem; | 468 | goto Enomem; |
469 | 469 | ||
470 | memset(op->downcall.trailer_buf, 0, op->downcall.trailer_size); | ||
471 | if (!copy_from_iter_full(op->downcall.trailer_buf, | 470 | if (!copy_from_iter_full(op->downcall.trailer_buf, |
472 | op->downcall.trailer_size, iter)) { | 471 | op->downcall.trailer_size, iter)) { |
473 | gossip_err("%s: failed to copy trailer.\n", __func__); | 472 | gossip_err("%s: failed to copy trailer.\n", __func__); |