From 9b32f4858c035134b5680b27678716d63370c678 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Thu, 15 Oct 2020 00:31:49 +0900 Subject: [PATCH] lib/rocksdb Use spdk_bdev_create_bs_dev_ext() to pass bdev_name Signed-off-by: Shuhei Matsumoto Change-Id: I4acce43baa95d0968b7b568e87fade1972efc646 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4704 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki Reviewed-by: Aleksey Marchuk --- lib/rocksdb/env_spdk.cc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/rocksdb/env_spdk.cc b/lib/rocksdb/env_spdk.cc index f56de2336..909ff5614 100644 --- a/lib/rocksdb/env_spdk.cc +++ b/lib/rocksdb/env_spdk.cc @@ -662,22 +662,28 @@ fs_load_cb(__attribute__((unused)) void *ctx, g_spdk_ready = true; } +static void +base_bdev_event_cb(enum spdk_bdev_event_type type, struct spdk_bdev *bdev, + void *event_ctx) +{ + printf("Unsupported bdev event: type %d\n", type); +} + static void rocksdb_run(__attribute__((unused)) void *arg1) { - struct spdk_bdev *bdev; + int rc; - bdev = spdk_bdev_get_by_name(g_bdev_name.c_str()); - - if (bdev == NULL) { - SPDK_ERRLOG("bdev %s not found\n", g_bdev_name.c_str()); + rc = spdk_bdev_create_bs_dev_ext(g_bdev_name.c_str(), base_bdev_event_cb, NULL, + &g_bs_dev); + if (rc != 0) { + printf("Could not create blob bdev\n"); spdk_app_stop(0); exit(1); } g_lcore = spdk_env_get_first_core(); - g_bs_dev = spdk_bdev_create_bs_dev(bdev, NULL, NULL); printf("using bdev %s\n", g_bdev_name.c_str()); spdk_fs_load(g_bs_dev, __send_request, fs_load_cb, NULL); }