Commit c4b94d87 authored by Marcin Dziegielewski's avatar Marcin Dziegielewski Committed by Jim Harris
Browse files

lib/bdev/ocf: remove unused code related to polling utils 



After switch all management operations to asynhronus way, utlis connected
with polling are no longer needed, this patch removes that code.

Signed-off-by: default avatarMarcin Dziegielewski <marcin.dziegielewski@intel.com>
Change-Id: Ia30e733c51089b1659f79c99d8cd711945a98fa0
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/470353


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarVitaliy Mysak <vitaliy.mysak@intel.com>
parent c74b4b32

module/bdev/ocf/utils.c

+0 −43
Original line number Diff line number Diff line
@@ -69,23 +69,6 @@ ocf_get_cache_modename(ocf_cache_mode_t mode) 
	}

}



static int

mngt_poll_fn(void *opaque)

{

	struct vbdev_ocf *vbdev = opaque;



	if (vbdev->mngt_ctx.poller_fn) {

		if (vbdev->mngt_ctx.timeout_ts &&

		    spdk_get_ticks() >= vbdev->mngt_ctx.timeout_ts) {

			vbdev_ocf_mngt_continue(vbdev, -ETIMEDOUT);

		} else {

			vbdev->mngt_ctx.poller_fn(vbdev);

		}

	}



	return 0;

}



int

vbdev_ocf_mngt_start(struct vbdev_ocf *vbdev, vbdev_ocf_mngt_fn *path,

		     vbdev_ocf_mngt_callback cb, void *cb_arg)
@@ -96,11 +79,6 @@ vbdev_ocf_mngt_start(struct vbdev_ocf *vbdev, vbdev_ocf_mngt_fn *path, 


	memset(&vbdev->mngt_ctx, 0, sizeof(vbdev->mngt_ctx));



	vbdev->mngt_ctx.poller = spdk_poller_register(mngt_poll_fn, vbdev, 200);

	if (vbdev->mngt_ctx.poller == NULL) {

		return -ENOMEM;

	}



	vbdev->mngt_ctx.current_step = path;

	vbdev->mngt_ctx.cb = cb;

	vbdev->mngt_ctx.cb_arg = cb_arg;
@@ -110,24 +88,6 @@ vbdev_ocf_mngt_start(struct vbdev_ocf *vbdev, vbdev_ocf_mngt_fn *path, 
	return 0;

}





static void

vbdev_ocf_mngt_poll_set_timeout(struct vbdev_ocf *vbdev, uint64_t millisec)

{

	uint64_t ticks;



	ticks = millisec * spdk_get_ticks_hz() / 1000;

	vbdev->mngt_ctx.timeout_ts = spdk_get_ticks() + ticks;

}



void

vbdev_ocf_mngt_poll(struct vbdev_ocf *vbdev, vbdev_ocf_mngt_fn fn)

{

	assert(vbdev->mngt_ctx.poller != NULL);

	vbdev->mngt_ctx.poller_fn = fn;

	vbdev_ocf_mngt_poll_set_timeout(vbdev, 5000);

}



void

vbdev_ocf_mngt_stop(struct vbdev_ocf *vbdev, vbdev_ocf_mngt_fn *rollback_path, int status)

{
@@ -142,8 +102,6 @@ vbdev_ocf_mngt_stop(struct vbdev_ocf *vbdev, vbdev_ocf_mngt_fn *rollback_path, i 
		return;

	}



	spdk_poller_unregister(&vbdev->mngt_ctx.poller);



	if (vbdev->mngt_ctx.cb) {

		vbdev->mngt_ctx.cb(vbdev->mngt_ctx.status, vbdev, vbdev->mngt_ctx.cb_arg);

	}
@@ -161,7 +119,6 @@ vbdev_ocf_mngt_continue(struct vbdev_ocf *vbdev, int status) 
	assert((*vbdev->mngt_ctx.current_step) != NULL);



	vbdev->mngt_ctx.status = status;

	vbdev->mngt_ctx.poller_fn = NULL;



	vbdev->mngt_ctx.current_step++;

	if (*vbdev->mngt_ctx.current_step) {

module/bdev/ocf/vbdev_ocf.h

+0 −2
Original line number Diff line number Diff line
@@ -107,8 +107,6 @@ struct vbdev_ocf_mngt_ctx { 
	 * It gets incremented on each step until it dereferences to NULL */

	vbdev_ocf_mngt_fn                  *current_step;



	/* Poller, registered once per whole management operation */

	struct spdk_poller                 *poller;

	/* Function that gets invoked by poller on each iteration */

	vbdev_ocf_mngt_fn                   poller_fn;

	/* Poller timeout time stamp - when the poller should stop with error */