Commit 6d44f7b7 authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

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: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/432086


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent f06d3d3b

examples/bdev/fio_plugin/fio_plugin.c

+20 −20
Original line number Diff line number Diff line
@@ -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)

{
@@ -430,26 +450,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)

{