From 526d759a2d17aeec2f74e49ba31b7b0715048601 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Tue, 10 Oct 2017 15:00:31 +0200 Subject: [PATCH] vbdev/unit: destroy bs_dev during unload If there is no lvol on lvol store in destroy bs_dev in vbdev unit tests. Signed-off-by: Tomasz Zawadzki Change-Id: I5b4783c98bb1b6bba011118f46f708ad0f0fb222 Reviewed-on: https://review.gerrithub.io/382018 Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Daniel Verkamp --- test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c b/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c index d05a5a7e2..db1454f16 100644 --- a/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c +++ b/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c @@ -124,9 +124,15 @@ spdk_lvs_unload(struct spdk_lvol_store *lvs, spdk_lvs_op_complete cb_fn, void *cb_arg) { struct spdk_lvol_store_req *req = cb_arg; - free(req); - free(lvs); + g_lvol_store = NULL; + free(lvs); + + if (g_lvol == NULL) + g_bs_dev->destroy(g_bs_dev); + + if (cb_fn != NULL) + cb_fn(req, 0); return 0; } @@ -505,6 +511,7 @@ ut_lvs_init(void) vbdev_lvs_destruct(lvs, lvol_store_op_complete, NULL); CU_ASSERT(g_lvserrno == 0); CU_ASSERT(g_lvol_store == NULL); + CU_ASSERT(g_bs_dev == NULL); free(g_bs_dev); }