From 3981ba698b598740fae77c66186172be53b0b6d0 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Mon, 1 Oct 2018 12:20:44 -0700 Subject: [PATCH] test/reduce: create common function for initializing backing dev Signed-off-by: Jim Harris Change-Id: Ica3c2bc6b7c286485ec92e27c71d17ee1e8779a3 Reviewed-on: https://review.gerrithub.io/432501 Chandler-Test-Pool: SPDK Automated Test System Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Shuhei Matsumoto Reviewed-by: Ben Walker --- test/unit/lib/reduce/reduce.c/reduce_ut.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/test/unit/lib/reduce/reduce.c/reduce_ut.c b/test/unit/lib/reduce/reduce.c/reduce_ut.c index f5ad02981..5f69b5ea6 100644 --- a/test/unit/lib/reduce/reduce.c/reduce_ut.c +++ b/test/unit/lib/reduce/reduce.c/reduce_ut.c @@ -240,6 +240,13 @@ init_failure(void) pm_file_destroy(); } +static void +backing_dev_init(struct spdk_reduce_backing_dev *backing_dev, struct spdk_reduce_vol_params *params) +{ + backing_dev->blocklen = params->backing_io_unit_size; + backing_dev->blockcnt = spdk_reduce_get_backing_device_size(params) / backing_dev->blocklen; +} + static void init_md(void) { @@ -248,14 +255,12 @@ init_md(void) struct spdk_reduce_backing_dev backing_dev = {}; struct spdk_reduce_pm_file pm_file = {}; - backing_dev.blocklen = 512; - params.vol_size = 1024 * 1024; /* 1MB */ params.chunk_size = 16 * 1024; - params.backing_io_unit_size = backing_dev.blocklen; + params.backing_io_unit_size = 512; spdk_uuid_generate(¶ms.uuid); - backing_dev.blockcnt = spdk_reduce_get_backing_device_size(¶ms) / backing_dev.blocklen; + backing_dev_init(&backing_dev, ¶ms); pm_file_init(&pm_file, ¶ms); g_vol = NULL;