update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / test / env / vtophys / vtophys.c

diff --git a/ceph/src/spdk/test/env/vtophys/vtophys.c b/ceph/src/spdk/test/env/vtophys/vtophys.c
index 62ae0828d6cbe8c920ed6fc1a13d2a3fadf2898d..e0d4d7992e1665316cb5780ebf0683478be3c613 100644 (file)
--- a/ceph/src/spdk/test/env/vtophys/vtophys.c
+++ b/ceph/src/spdk/test/env/vtophys/vtophys.c
@@ -67,7 +67,7 @@ vtophys_malloc_test(void)
 
        /* Test addresses that are not in the valid x86-64 usermode range */
        paddr = spdk_vtophys((void *)0x0000800000000000ULL, NULL);
-       CU_ASSERT(paddr == SPDK_VTOPHYS_ERROR)
+       CU_ASSERT(paddr == SPDK_VTOPHYS_ERROR);
 }
 
 static void
@@ -81,7 +81,7 @@ vtophys_spdk_malloc_test(void)
 
        /* Test vtophys on memory allocated through SPDK */
        for (i = 0; i < 31; i++) {
-               buf = spdk_dma_zmalloc(size, buf_align, NULL);
+               buf = spdk_zmalloc(size, buf_align, NULL, SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);
                if (buf == NULL) {
                        continue;
                }
@@ -146,7 +146,7 @@ vtophys_spdk_malloc_test(void)
                        tmpsize = UINT64_MAX;
                }
 
-               spdk_dma_free(buf);
+               spdk_free(buf);
                size = size << 1;
        }
 }