From e3e524306b71816a04455d849c6cb8780fe5224d Mon Sep 17 00:00:00 2001 From: Darek Stojaczyk Date: Wed, 26 Jun 2019 11:18:14 +0200 Subject: [PATCH] nbd: switch to spdk_*malloc() spdk_dma_*malloc() is about to be deprecated. Change-Id: If0bcdf2be9756b343375f02837a414d3b86f2bca Signed-off-by: Darek Stojaczyk Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459430 Tested-by: SPDK CI Jenkins Reviewed-by: Paul Luse Reviewed-by: Tomasz Zawadzki Reviewed-by: Changpeng Liu Reviewed-by: Shuhei Matsumoto Reviewed-by: Ben Walker --- lib/nbd/nbd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/nbd/nbd.c b/lib/nbd/nbd.c index ff850196b..ad37e9e5e 100644 --- a/lib/nbd/nbd.c +++ b/lib/nbd/nbd.c @@ -274,7 +274,7 @@ static void spdk_put_nbd_io(struct spdk_nbd_disk *nbd, struct nbd_io *io) { if (io->payload) { - spdk_dma_free(io->payload); + spdk_free(io->payload); } free(io); @@ -618,7 +618,8 @@ spdk_nbd_io_recv_internal(struct spdk_nbd_disk *nbd) /* io payload allocate */ if (io->payload_size) { - io->payload = spdk_dma_malloc(io->payload_size, nbd->buf_align, NULL); + io->payload = spdk_malloc(io->payload_size, nbd->buf_align, NULL, + SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA); if (io->payload == NULL) { SPDK_ERRLOG("could not allocate io->payload of size %d\n", io->payload_size); spdk_put_nbd_io(nbd, io);