From 114da5a203a12be13bc08c355a7b18173b7027af Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Tue, 18 Feb 2020 06:00:56 -0500 Subject: [PATCH] ut/blob: always use local blob pointer Always call API on pointer that was received from blob open, instead of relying on global one. Where necessary added declaration and assignment. Signed-off-by: Tomasz Zawadzki Change-Id: I15531111201d071c471f5be79ce18ff508631677 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/943 Tested-by: SPDK CI Jenkins Reviewed-by: Paul Luse Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto --- test/unit/lib/blob/blob.c/blob_ut.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/test/unit/lib/blob/blob.c/blob_ut.c b/test/unit/lib/blob/blob.c/blob_ut.c index cb5709296..ced132c03 100644 --- a/test/unit/lib/blob/blob.c/blob_ut.c +++ b/test/unit/lib/blob/blob.c/blob_ut.c @@ -2936,6 +2936,7 @@ bs_usable_clusters(void) { struct spdk_blob_store *bs = g_bs; struct spdk_blob_opts blob_opts; + struct spdk_blob *blob; uint32_t clusters; int i; @@ -2962,13 +2963,14 @@ bs_usable_clusters(void) poll_threads(); CU_ASSERT(g_bserrno == 0); CU_ASSERT(g_blob != NULL); + blob = g_blob; - spdk_blob_resize(g_blob, 10, blob_op_complete, NULL); + spdk_blob_resize(blob, 10, blob_op_complete, NULL); poll_threads(); CU_ASSERT(g_bserrno == 0); g_bserrno = -1; - spdk_blob_close(g_blob, blob_op_complete, NULL); + spdk_blob_close(blob, blob_op_complete, NULL); poll_threads(); CU_ASSERT(g_bserrno == 0); @@ -2995,6 +2997,7 @@ bs_resize_md(void) const int NUM_BLOBS = CLUSTER_PAGE_COUNT * 4; struct spdk_bs_dev *dev; struct spdk_bs_opts opts; + struct spdk_blob *blob; struct spdk_blob_opts blob_opts; uint32_t cluster_sz; spdk_blob_id blobids[NUM_BLOBS]; @@ -3038,8 +3041,9 @@ bs_resize_md(void) poll_threads(); CU_ASSERT(g_bserrno == 0); CU_ASSERT(g_blob != NULL); + blob = g_blob; g_bserrno = -1; - spdk_blob_close(g_blob, blob_op_complete, NULL); + spdk_blob_close(blob, blob_op_complete, NULL); poll_threads(); CU_ASSERT(g_bserrno == 0); } @@ -3468,8 +3472,9 @@ blob_dirty_shutdown(void) poll_threads(); CU_ASSERT(g_bserrno == 0); CU_ASSERT(g_blob != NULL); + blob = g_blob; CU_ASSERT(free_clusters == spdk_bs_free_cluster_count(bs)); - spdk_blob_close(g_blob, blob_op_complete, NULL); + spdk_blob_close(blob, blob_op_complete, NULL); poll_threads(); CU_ASSERT(g_bserrno == 0); @@ -3714,6 +3719,7 @@ bs_version(void) struct spdk_bs_super_block *super; struct spdk_blob_store *bs = g_bs; struct spdk_bs_dev *dev; + struct spdk_blob *blob; struct spdk_blob_opts blob_opts; spdk_blob_id blobid; @@ -3786,8 +3792,9 @@ bs_version(void) poll_threads(); CU_ASSERT(g_bserrno == 0); CU_ASSERT(g_blob != NULL); + blob = g_blob; - spdk_blob_close(g_blob, blob_op_complete, NULL); + spdk_blob_close(blob, blob_op_complete, NULL); poll_threads(); CU_ASSERT(g_bserrno == 0);