From a5f0d9358d55a0fddad724c7993d26473716cbb1 Mon Sep 17 00:00:00 2001 From: GangCao Date: Fri, 7 Oct 2016 16:49:09 -0400 Subject: [PATCH] nvme: use nvme_malloc for calloc to share ctrlr->ns among processes Change-Id: I3e4f211acc0c0db7a6957dd20715da9fc298f73e Signed-off-by: GangCao --- lib/nvme/nvme_ctrlr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c index f4d331cdd..7844935d8 100644 --- a/lib/nvme/nvme_ctrlr.c +++ b/lib/nvme/nvme_ctrlr.c @@ -660,7 +660,7 @@ nvme_ctrlr_destruct_namespaces(struct spdk_nvme_ctrlr *ctrlr) nvme_ns_destruct(&ctrlr->ns[i]); } - free(ctrlr->ns); + nvme_free(ctrlr->ns); ctrlr->ns = NULL; ctrlr->num_ns = 0; } @@ -688,7 +688,8 @@ nvme_ctrlr_construct_namespaces(struct spdk_nvme_ctrlr *ctrlr) if (nn != ctrlr->num_ns) { nvme_ctrlr_destruct_namespaces(ctrlr); - ctrlr->ns = calloc(nn, sizeof(struct spdk_nvme_ns)); + ctrlr->ns = nvme_malloc(nn * sizeof(struct spdk_nvme_ns), 64, + &phys_addr); if (ctrlr->ns == NULL) { goto fail; }