Commit cac0e9d0 authored by Vitaliy Mysak's avatar Vitaliy Mysak Committed by Darek Stojaczyk
Browse files

ocf: move register_finish() function up 



Move last step of register chain to the top because it is arguably more readable.
This should not be done in previus patch because it spoils the gerrithub diff.

Change-Id: If51642a32c5cf2a757ca20485d2347410653ca2a
Signed-off-by: default avatarVitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/454574


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent 9000deb7

lib/bdev/ocf/vbdev_ocf.c

+31 −31
Original line number Diff line number Diff line
@@ -737,6 +737,37 @@ io_device_destroy_cb(void *io_device, void *ctx_buf) 
	ocf_queue_put(qctx->queue);

}



static void

finish_register(struct vbdev_ocf *vbdev)

{

	int result;



	/* Copy properties of the base bdev */

	vbdev->exp_bdev.blocklen = vbdev->core.bdev->blocklen;

	vbdev->exp_bdev.write_cache = vbdev->core.bdev->write_cache;

	vbdev->exp_bdev.required_alignment = vbdev->core.bdev->required_alignment;



	vbdev->exp_bdev.name = vbdev->name;

	vbdev->exp_bdev.product_name = "SPDK OCF";



	vbdev->exp_bdev.blockcnt = vbdev->core.bdev->blockcnt;

	vbdev->exp_bdev.ctxt = vbdev;

	vbdev->exp_bdev.fn_table = &cache_dev_fn_table;

	vbdev->exp_bdev.module = &ocf_if;



	/* Finally register vbdev in SPDK */

	spdk_io_device_register(vbdev, io_device_create_cb, io_device_destroy_cb,

				sizeof(struct vbdev_ocf_qcxt), vbdev->name);

	result = spdk_bdev_register(&vbdev->exp_bdev);

	if (result) {

		SPDK_ERRLOG("Could not register exposed bdev\n");

	} else {

		vbdev->state.started = true;

	}



	vbdev_ocf_mngt_continue(vbdev, result);

}



/* Try to lock cache, then add core */

static void

add_core_poll(struct vbdev_ocf *vbdev)
@@ -804,37 +835,6 @@ start_cache(struct vbdev_ocf *vbdev) 
	vbdev_ocf_mngt_continue(vbdev, rc);

}



static void

finish_register(struct vbdev_ocf *vbdev)

{

	int result;



	/* Copy properties of the base bdev */

	vbdev->exp_bdev.blocklen = vbdev->core.bdev->blocklen;

	vbdev->exp_bdev.write_cache = vbdev->core.bdev->write_cache;

	vbdev->exp_bdev.required_alignment = vbdev->core.bdev->required_alignment;



	vbdev->exp_bdev.name = vbdev->name;

	vbdev->exp_bdev.product_name = "SPDK OCF";



	vbdev->exp_bdev.blockcnt = vbdev->core.bdev->blockcnt;

	vbdev->exp_bdev.ctxt = vbdev;

	vbdev->exp_bdev.fn_table = &cache_dev_fn_table;

	vbdev->exp_bdev.module = &ocf_if;



	/* Finally register vbdev in SPDK */

	spdk_io_device_register(vbdev, io_device_create_cb, io_device_destroy_cb,

				sizeof(struct vbdev_ocf_qcxt), vbdev->name);

	result = spdk_bdev_register(&vbdev->exp_bdev);

	if (result) {

		SPDK_ERRLOG("Could not register exposed bdev\n");

	} else {

		vbdev->state.started = true;

	}



	vbdev_ocf_mngt_continue(vbdev, result);

}



/* Procedures called during register operation */

vbdev_ocf_mngt_fn register_path[] = {

	start_cache,