From f651e22a98a49788a15efc3eefc312bc6fa7294a Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Wed, 19 May 2021 21:07:44 +0000 Subject: [PATCH] bdev: remove all references to spdk_bdev_open This API was removed previously, so remove remaining references in map file and unit tests. Signed-off-by: Jim Harris Change-Id: Iba2f6a5f5ba590d3996dc133c8181083a33d7405 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7963 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Shuhei Matsumoto Reviewed-by: Aleksey Marchuk --- lib/bdev/spdk_bdev.map | 1 - test/unit/lib/nvmf/fc.c/fc_ut.c | 3 --- test/unit/lib/scsi/lun.c/lun_ut.c | 5 ----- 3 files changed, 9 deletions(-) diff --git a/lib/bdev/spdk_bdev.map b/lib/bdev/spdk_bdev.map index 91d21d5db6..2e3df5fd22 100644 --- a/lib/bdev/spdk_bdev.map +++ b/lib/bdev/spdk_bdev.map @@ -15,7 +15,6 @@ spdk_bdev_next; spdk_bdev_first_leaf; spdk_bdev_next_leaf; - spdk_bdev_open; spdk_bdev_open_ext; spdk_bdev_close; spdk_bdev_desc_get_bdev; diff --git a/test/unit/lib/nvmf/fc.c/fc_ut.c b/test/unit/lib/nvmf/fc.c/fc_ut.c index 5605057677..cad99e4822 100644 --- a/test/unit/lib/nvmf/fc.c/fc_ut.c +++ b/test/unit/lib/nvmf/fc.c/fc_ut.c @@ -112,9 +112,6 @@ DEFINE_STUB(spdk_bdev_get_io_channel, struct spdk_io_channel *, (struct spdk_bde NULL); DEFINE_STUB_V(spdk_nvmf_request_exec, (struct spdk_nvmf_request *req)); DEFINE_STUB_V(nvmf_ctrlr_ns_changed, (struct spdk_nvmf_ctrlr *ctrlr, uint32_t nsid)); -DEFINE_STUB(spdk_bdev_open, int, (struct spdk_bdev *bdev, bool write, - spdk_bdev_remove_cb_t remove_cb, - void *remove_ctx, struct spdk_bdev_desc **desc), 0); DEFINE_STUB_V(spdk_bdev_close, (struct spdk_bdev_desc *desc)); DEFINE_STUB(spdk_bdev_module_claim_bdev, int, (struct spdk_bdev *bdev, struct spdk_bdev_desc *desc, diff --git a/test/unit/lib/scsi/lun.c/lun_ut.c b/test/unit/lib/scsi/lun.c/lun_ut.c index 5501537c0e..532318fa5f 100644 --- a/test/unit/lib/scsi/lun.c/lun_ut.c +++ b/test/unit/lib/scsi/lun.c/lun_ut.c @@ -94,11 +94,6 @@ spdk_bdev_free_io(struct spdk_bdev_io *bdev_io) CU_ASSERT(0); } -DEFINE_STUB(spdk_bdev_open, int, - (struct spdk_bdev *bdev, bool write, spdk_bdev_remove_cb_t remove_cb, - void *remove_ctx, struct spdk_bdev_desc **desc), - 0); - DEFINE_STUB(spdk_bdev_open_ext, int, (const char *bdev_name, bool write, spdk_bdev_event_cb_t event_cb, void *event_ctx, struct spdk_bdev_desc **desc),