Commit 63423328 authored by Darek Stojaczyk's avatar Darek Stojaczyk Committed by Changpeng Liu
Browse files

bdev: switch to spdk_*malloc(). 



spdk_dma_*malloc() is about to be deprecated.

Change-Id: Idb18f7ef44634deaf63139f0f872881c9cdaefac
Signed-off-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/450256


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 5ac7440a

lib/bdev/bdev.c

+3 −3
Original line number Diff line number Diff line
@@ -974,8 +974,8 @@ spdk_bdev_initialize(spdk_bdev_init_cb cb_fn, void *cb_arg) 
		return;

	}



	g_bdev_mgr.zero_buffer = spdk_dma_zmalloc(ZERO_BUFFER_SIZE, ZERO_BUFFER_SIZE,

				 NULL);

	g_bdev_mgr.zero_buffer = spdk_zmalloc(ZERO_BUFFER_SIZE, ZERO_BUFFER_SIZE,

					      NULL, SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);

	if (!g_bdev_mgr.zero_buffer) {

		SPDK_ERRLOG("create bdev zero buffer failed\n");

		spdk_bdev_init_complete(-1);
@@ -1030,7 +1030,7 @@ spdk_bdev_mgr_unregister_cb(void *io_device) 
	spdk_mempool_free(g_bdev_mgr.bdev_io_pool);

	spdk_mempool_free(g_bdev_mgr.buf_small_pool);

	spdk_mempool_free(g_bdev_mgr.buf_large_pool);

	spdk_dma_free(g_bdev_mgr.zero_buffer);

	spdk_free(g_bdev_mgr.zero_buffer);



	cb_fn(g_fini_cb_arg);

	g_fini_cb_fn = NULL;

lib/bdev/gpt/vbdev_gpt.c

+3 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ spdk_gpt_base_free(void *ctx) 
{

	struct gpt_base *gpt_base = ctx;



	spdk_dma_free(gpt_base->gpt.buf);

	spdk_free(gpt_base->gpt.buf);

	free(gpt_base);

}
@@ -147,7 +147,8 @@ spdk_gpt_base_bdev_init(struct spdk_bdev *bdev) 
	gpt = &gpt_base->gpt;

	gpt->parse_phase = SPDK_GPT_PARSE_PHASE_PRIMARY;

	gpt->buf_size = spdk_max(SPDK_GPT_BUFFER_SIZE, bdev->blocklen);

	gpt->buf = spdk_dma_zmalloc(gpt->buf_size, spdk_bdev_get_buf_align(bdev), NULL);

	gpt->buf = spdk_zmalloc(gpt->buf_size, spdk_bdev_get_buf_align(bdev), NULL,

				SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);

	if (!gpt->buf) {

		SPDK_ERRLOG("Cannot alloc buf\n");

		spdk_bdev_part_base_free(gpt_base->part_base);