ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nbd: switch to spdk_*malloc()

Browse Source 
spdk_dma_*malloc() is about to be deprecated.

Change-Id: If0bcdf2be9756b343375f02837a414d3b86f2bca
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459430
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Darek Stojaczyk 2019-06-26 11:18:14 +02:00 committed by Changpeng Liu
parent 23fcc697e5
commit e3e524306b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/nbd/nbd.c
View File

@ -274,7 +274,7 @@ static void
spdk_put_nbd_io(struct spdk_nbd_disk *nbd, struct nbd_io *io) spdk_put_nbd_io(struct spdk_nbd_disk *nbd, struct nbd_io *io)
{ {
if (io->payload) { if (io->payload) {
spdk_dma_free(io->payload); spdk_free(io->payload);
} }
free(io); free(io);
@ -618,7 +618,8 @@ spdk_nbd_io_recv_internal(struct spdk_nbd_disk *nbd)
/* io payload allocate */ /* io payload allocate */
if (io->payload_size) { 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) { if (io->payload == NULL) {
SPDK_ERRLOG("could not allocate io->payload of size %d\n", io->payload_size); SPDK_ERRLOG("could not allocate io->payload of size %d\n", io->payload_size);
spdk_put_nbd_io(nbd, io); spdk_put_nbd_io(nbd, io);