Commit 3ac1d76a authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/ocf: Use spdk_bdev_open_ext() instead of spdk_bdev_open() in attach_base() 



This is a drop-in replacement.

spdk_bdev_open_ext() requires the caller to specify event_cb.
Hence base_bdev_event_cb() calls hotremove_cb() only if event_cb is
not NULL.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I98cd29781412406470a173e9714c65a07288c573
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4690


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
parent c6358b97

module/bdev/ocf/vbdev_ocf.c

+19 −4
Original line number Diff line number Diff line
@@ -1348,9 +1348,8 @@ vbdev_ocf_module_fini(void) 
 * We will unregister cache vbdev here

 * When cache device is removed, we delete every OCF bdev that used it */

static void

hotremove_cb(void *ctx)

hotremove_cb(struct vbdev_ocf_base *base)

{

	struct vbdev_ocf_base *base = ctx;

	struct vbdev_ocf *vbdev;



	if (!base->is_cache) {
@@ -1377,6 +1376,22 @@ hotremove_cb(void *ctx) 
	}

}



static void

base_bdev_event_cb(enum spdk_bdev_event_type type, struct spdk_bdev *bdev,

		   void *event_ctx)

{

	switch (type) {

	case SPDK_BDEV_EVENT_REMOVE:

		if (event_ctx) {

			hotremove_cb(event_ctx);

		}

		break;

	default:

		SPDK_NOTICELOG("Unsupported bdev event: type %d\n", type);

		break;

	}

}



/* Open base SPDK bdev and claim it */

static int

attach_base(struct vbdev_ocf_base *base)
@@ -1399,7 +1414,7 @@ attach_base(struct vbdev_ocf_base *base) 
		}

	}



	status = spdk_bdev_open(base->bdev, true, hotremove_cb, base, &base->desc);

	status = spdk_bdev_open_ext(base->name, true, base_bdev_event_cb, base, &base->desc);

	if (status) {

		SPDK_ERRLOG("Unable to open device '%s' for writing\n", base->name);

		return status;
@@ -1736,7 +1751,7 @@ vbdev_ocf_examine_disk(struct spdk_bdev *bdev) 
	ctx->base.bdev = bdev;

	ctx->refcnt = 1;



	rc = spdk_bdev_open(ctx->base.bdev, true, NULL, NULL, &ctx->base.desc);

	rc = spdk_bdev_open_ext(bdev_name, true, base_bdev_event_cb, NULL, &ctx->base.desc);

	if (rc) {

		ctx->result = rc;

		examine_ctx_put(ctx);