Commit e3e52430 authored Jun 26, 2019 by Darek Stojaczyk Committed by Changpeng Liu Jul 17, 2019

nbd: switch to spdk_*malloc()



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>

parent 23fcc697

lib/nbd/nbd.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message