From 1e8fac45ecdea3abe7193a7cb0774067c0353a39 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Wed, 21 Oct 2020 19:06:04 +0900 Subject: [PATCH] examples/bdev_fio_plugin: Use spdk_bdev_open_ext() instead of spdk_bdev_open() This is a drop-in replacement. Signed-off-by: Shuhei Matsumoto Change-Id: Ia858b755718da97e48035b7e7ca4544f6f9b9a63 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4807 Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris --- examples/bdev/fio_plugin/fio_plugin.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/examples/bdev/fio_plugin/fio_plugin.c b/examples/bdev/fio_plugin/fio_plugin.c index f707e7d3c..4ceec651e 100644 --- a/examples/bdev/fio_plugin/fio_plugin.c +++ b/examples/bdev/fio_plugin/fio_plugin.c @@ -475,6 +475,13 @@ spdk_fio_setup(struct thread_data *td) return 0; } +static void +fio_bdev_event_cb(enum spdk_bdev_event_type type, struct spdk_bdev *bdev, + void *event_ctx) +{ + SPDK_WARNLOG("Unsupported bdev event: type %d\n", type); +} + static void spdk_fio_bdev_open(void *arg) { @@ -500,15 +507,8 @@ spdk_fio_bdev_open(void *arg) return; } - target->bdev = spdk_bdev_get_by_name(f->file_name); - if (!target->bdev) { - SPDK_ERRLOG("Unable to find bdev with name %s\n", f->file_name); - free(target); - fio_thread->failed = true; - return; - } - - rc = spdk_bdev_open(target->bdev, true, NULL, NULL, &target->desc); + rc = spdk_bdev_open_ext(f->file_name, true, fio_bdev_event_cb, NULL, + &target->desc); if (rc) { SPDK_ERRLOG("Unable to open bdev %s\n", f->file_name); free(target); @@ -516,6 +516,8 @@ spdk_fio_bdev_open(void *arg) return; } + target->bdev = spdk_bdev_desc_get_bdev(target->desc); + target->ch = spdk_bdev_get_io_channel(target->desc); if (!target->ch) { SPDK_ERRLOG("Unable to get I/O channel for bdev.\n");