IB/hfi1: kzalloc to kzalloc_flex
Subsystems (2)
PATCH v2 1/1 IB/hfi1: kzalloc to kzalloc_flex
Combine kzalloc and kcalloc with a flexible array member. Avoids having to free separately.
Signed-off-by Rosen Penev <[email protected]>
---
v2: rebase
drivers/infiniband/hw/hfi1/user_exp_rcv.c | 9 +-------- drivers/infiniband/hw/hfi1/user_exp_rcv.h | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-)
drivers/infiniband/hw/hfi1/user_exp_rcv.c +1 -8
@@ -257,7 +257,7 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd,if (tinfo->length ==0 )return -EINVAL ; - tidbuf =kzalloc_obj (*tidbuf); + tidbuf =kzalloc_flex (*tidbuf, psets, uctxt->expected_count);if (!tidbuf)return -ENOMEM ;
@@ -265,11 +265,6 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, tidbuf->vaddr = tinfo->vaddr; tidbuf->length = tinfo->length; tidbuf->npages =num_user_pages (tidbuf->vaddr, tidbuf->length); - tidbuf->psets =kzalloc_objs (*tidbuf->psets, uctxt->expected_count); -if (!tidbuf->psets) { - ret = -ENOMEM ; - goto fail_release_mem; - }if (fd->use_mn) { ret = mmu_interval_notifier_insert(
@@ -447,7 +442,6 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd,if (fd->use_mn)mmu_interval_notifier_remove (&tidbuf->notifier);kfree (tidbuf->pages); -kfree (tidbuf->psets);kfree (tidbuf);kfree (tidlist);return 0 ;
@@ -470,7 +464,6 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd,unpin_rcv_pages (fd, tidbuf,NULL ,0 , pinned, false); fail_release_mem:kfree (tidbuf->pages); -kfree (tidbuf->psets);kfree (tidbuf);kfree (tidlist);return ret;
drivers/infiniband/hw/hfi1/user_exp_rcv.h +1 -1
@@ -22,8 +22,8 @@ struct tid_user_buf {unsigned long length;unsigned int npages;struct page **pages; -struct tid_pageset *psets;unsigned int n_psets; +struct tid_pageset psets[]; };struct tid_rb_node {
--
2.53.0
Leon Romanovsky
AppliedQuoted 2 lines · Rosen Penev
Combine kzalloc and kcalloc with a flexible array member. Avoids having to free separately.
Applied, thanks!
[1/1] IB/hfi1: kzalloc to kzalloc_flex
https://git.kernel.org/rdma/rdma/c/120ad1fd591402
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>