From 4860351f5c72f16c0dd5d6d87c1c68f76607274c Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Mon, 5 Nov 2018 15:27:18 -0700 Subject: [PATCH] fio_plugin: Move spdk_fio_cleanup_thread higher up We're going to use this in another function later in this patch series, so move it up now so we don't have to forward declare it later. Change-Id: I95244f062c6e75904ec2458cbad7a18a0923a5b0 Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/432086 (master) Reviewed-on: https://review.gerrithub.io/437198 Reviewed-by: Jim Harris Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System --- examples/bdev/fio_plugin/fio_plugin.c | 40 +++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/examples/bdev/fio_plugin/fio_plugin.c b/examples/bdev/fio_plugin/fio_plugin.c index 554d8592b..f5a546d5e 100644 --- a/examples/bdev/fio_plugin/fio_plugin.c +++ b/examples/bdev/fio_plugin/fio_plugin.c @@ -208,6 +208,26 @@ spdk_fio_init_thread(struct thread_data *td) return 0; } +static void +spdk_fio_cleanup_thread(struct spdk_fio_thread *fio_thread) +{ + struct spdk_fio_target *target, *tmp; + + TAILQ_FOREACH_SAFE(target, &fio_thread->targets, link, tmp) { + TAILQ_REMOVE(&fio_thread->targets, target, link); + spdk_put_io_channel(target->ch); + spdk_bdev_close(target->desc); + free(target); + } + + while (spdk_fio_poll_thread(fio_thread) > 0) {} + + spdk_free_thread(); + spdk_ring_free(fio_thread->ring); + free(fio_thread->iocq); + free(fio_thread); +} + static void * spdk_init_thread_poll(void *arg) { @@ -438,26 +458,6 @@ spdk_fio_init(struct thread_data *td) return 0; } -static void -spdk_fio_cleanup_thread(struct spdk_fio_thread *fio_thread) -{ - struct spdk_fio_target *target, *tmp; - - TAILQ_FOREACH_SAFE(target, &fio_thread->targets, link, tmp) { - TAILQ_REMOVE(&fio_thread->targets, target, link); - spdk_put_io_channel(target->ch); - spdk_bdev_close(target->desc); - free(target); - } - - while (spdk_fio_poll_thread(fio_thread) > 0) {} - - spdk_free_thread(); - spdk_ring_free(fio_thread->ring); - free(fio_thread->iocq); - free(fio_thread); -} - static void spdk_fio_cleanup(struct thread_data *td) {