From bcff4c89b89b8b5b5ad7b5cb990f1608b3517c46 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Wed, 23 May 2018 14:01:03 -0700 Subject: [PATCH] bdev: Rename spdk_internal/bdev.h to spdk/bdev_module.h This will become the public interface for implementing bdev modules. Right now the file exposes too much of the guts of the bdev layer to modules, so it needs to be stripped down. Change-Id: Ie8b8c3271d51fdb8d0c24a80244b3f3e510c8790 Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/412297 Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Daniel Verkamp Reviewed-by: Shuhei Matsumoto --- examples/bdev/hello_world/hello_bdev.c | 2 +- include/{spdk_internal/bdev.h => spdk/bdev_module.h} | 0 include/spdk_internal/lvolstore.h | 2 +- lib/bdev/aio/bdev_aio.h | 2 +- lib/bdev/bdev.c | 2 +- lib/bdev/error/vbdev_error.c | 2 +- lib/bdev/gpt/vbdev_gpt.c | 2 +- lib/bdev/iscsi/bdev_iscsi.c | 2 +- lib/bdev/lvol/vbdev_lvol.c | 2 +- lib/bdev/lvol/vbdev_lvol.h | 2 +- lib/bdev/malloc/bdev_malloc.c | 2 +- lib/bdev/null/bdev_null.c | 2 +- lib/bdev/null/bdev_null_rpc.c | 2 +- lib/bdev/nvme/bdev_nvme.c | 2 +- lib/bdev/nvme/bdev_nvme_rpc.c | 2 +- lib/bdev/part.c | 2 +- lib/bdev/passthru/vbdev_passthru.c | 2 +- lib/bdev/pmem/bdev_pmem.c | 2 +- lib/bdev/rbd/bdev_rbd.c | 2 +- lib/bdev/rpc/bdev_rpc.c | 2 +- lib/bdev/scsi_nvme.c | 2 +- lib/bdev/split/vbdev_split.c | 2 +- lib/bdev/split/vbdev_split.h | 2 +- lib/bdev/virtio/bdev_virtio_blk.c | 2 +- lib/bdev/virtio/bdev_virtio_scsi.c | 2 +- lib/blob/bdev/blob_bdev.c | 2 +- lib/nvmf/ctrlr_discovery.c | 2 +- lib/nvmf/subsystem.c | 2 +- lib/scsi/scsi_bdev.c | 2 +- test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c | 2 +- test/unit/lib/vhost/vhost_nvme.c/vhost_nvme_ut.c | 2 +- 31 files changed, 30 insertions(+), 30 deletions(-) rename include/{spdk_internal/bdev.h => spdk/bdev_module.h} (100%) diff --git a/examples/bdev/hello_world/hello_bdev.c b/examples/bdev/hello_world/hello_bdev.c index 3bdb72b92..6bc20325d 100644 --- a/examples/bdev/hello_world/hello_bdev.c +++ b/examples/bdev/hello_world/hello_bdev.c @@ -38,7 +38,7 @@ #include "spdk/event.h" #include "spdk/log.h" #include "spdk/string.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" static char *g_bdev_name = "Malloc0"; diff --git a/include/spdk_internal/bdev.h b/include/spdk/bdev_module.h similarity index 100% rename from include/spdk_internal/bdev.h rename to include/spdk/bdev_module.h diff --git a/include/spdk_internal/lvolstore.h b/include/spdk_internal/lvolstore.h index 30cff2155..cbe1d05c2 100644 --- a/include/spdk_internal/lvolstore.h +++ b/include/spdk_internal/lvolstore.h @@ -37,7 +37,7 @@ #include "spdk/blob.h" #include "spdk/lvol.h" #include "spdk/uuid.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" /* Default size of blobstore cluster */ #define SPDK_LVS_OPTS_CLUSTER_SZ (4 * 1024 * 1024) diff --git a/lib/bdev/aio/bdev_aio.h b/lib/bdev/aio/bdev_aio.h index 77c483f31..c2a3d14c1 100644 --- a/lib/bdev/aio/bdev_aio.h +++ b/lib/bdev/aio/bdev_aio.h @@ -41,7 +41,7 @@ #include "spdk/queue.h" #include "spdk/bdev.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" struct bdev_aio_task { struct iocb iocb; diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index 368d6cfee..673c1bed9 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -46,7 +46,7 @@ #include "spdk/scsi_spec.h" #include "spdk/util.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk_internal/log.h" #include "spdk/string.h" diff --git a/lib/bdev/error/vbdev_error.c b/lib/bdev/error/vbdev_error.c index 2226785ec..f09d9f449 100644 --- a/lib/bdev/error/vbdev_error.c +++ b/lib/bdev/error/vbdev_error.c @@ -43,7 +43,7 @@ #include "spdk/nvme_spec.h" #include "spdk/string.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk_internal/log.h" #include "vbdev_error.h" diff --git a/lib/bdev/gpt/vbdev_gpt.c b/lib/bdev/gpt/vbdev_gpt.c index 47895d73f..d9a96369c 100644 --- a/lib/bdev/gpt/vbdev_gpt.c +++ b/lib/bdev/gpt/vbdev_gpt.c @@ -46,7 +46,7 @@ #include "spdk/string.h" #include "spdk/util.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk_internal/log.h" static int vbdev_gpt_init(void); diff --git a/lib/bdev/iscsi/bdev_iscsi.c b/lib/bdev/iscsi/bdev_iscsi.c index f003b569e..38f6049d2 100644 --- a/lib/bdev/iscsi/bdev_iscsi.c +++ b/lib/bdev/iscsi/bdev_iscsi.c @@ -44,7 +44,7 @@ #include "spdk/string.h" #include "spdk_internal/log.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "iscsi/iscsi.h" #include "iscsi/scsi-lowlevel.h" diff --git a/lib/bdev/lvol/vbdev_lvol.c b/lib/bdev/lvol/vbdev_lvol.c index 3fdb96b7d..4ca7429b5 100644 --- a/lib/bdev/lvol/vbdev_lvol.c +++ b/lib/bdev/lvol/vbdev_lvol.c @@ -33,7 +33,7 @@ #include "spdk/blob_bdev.h" #include "spdk/rpc.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk_internal/log.h" #include "spdk/string.h" #include "spdk/uuid.h" diff --git a/lib/bdev/lvol/vbdev_lvol.h b/lib/bdev/lvol/vbdev_lvol.h index 89eaf1bda..93991d085 100644 --- a/lib/bdev/lvol/vbdev_lvol.h +++ b/lib/bdev/lvol/vbdev_lvol.h @@ -35,7 +35,7 @@ #define SPDK_VBDEV_LVOL_H #include "spdk/lvol.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk_internal/lvolstore.h" diff --git a/lib/bdev/malloc/bdev_malloc.c b/lib/bdev/malloc/bdev_malloc.c index 699eb7e00..63735f086 100644 --- a/lib/bdev/malloc/bdev_malloc.c +++ b/lib/bdev/malloc/bdev_malloc.c @@ -45,7 +45,7 @@ #include "spdk/queue.h" #include "spdk/string.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk_internal/log.h" struct malloc_disk { diff --git a/lib/bdev/null/bdev_null.c b/lib/bdev/null/bdev_null.c index 5df16367d..3fb6dd2ce 100644 --- a/lib/bdev/null/bdev_null.c +++ b/lib/bdev/null/bdev_null.c @@ -39,7 +39,7 @@ #include "spdk/io_channel.h" #include "spdk/json.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk_internal/log.h" #include "bdev_null.h" diff --git a/lib/bdev/null/bdev_null_rpc.c b/lib/bdev/null/bdev_null_rpc.c index ffb21f85f..02cc2d3b1 100644 --- a/lib/bdev/null/bdev_null_rpc.c +++ b/lib/bdev/null/bdev_null_rpc.c @@ -34,7 +34,7 @@ #include "spdk/rpc.h" #include "spdk/util.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk_internal/log.h" #include "bdev_null.h" diff --git a/lib/bdev/nvme/bdev_nvme.c b/lib/bdev/nvme/bdev_nvme.c index 908cf9306..9d89f4936 100644 --- a/lib/bdev/nvme/bdev_nvme.c +++ b/lib/bdev/nvme/bdev_nvme.c @@ -46,7 +46,7 @@ #include "spdk/likely.h" #include "spdk/util.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk_internal/log.h" static void bdev_nvme_get_spdk_running_config(FILE *fp); diff --git a/lib/bdev/nvme/bdev_nvme_rpc.c b/lib/bdev/nvme/bdev_nvme_rpc.c index 999c010da..d57008174 100644 --- a/lib/bdev/nvme/bdev_nvme_rpc.c +++ b/lib/bdev/nvme/bdev_nvme_rpc.c @@ -40,7 +40,7 @@ #include "spdk/util.h" #include "spdk_internal/log.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" struct open_descriptors { void *desc; diff --git a/lib/bdev/part.c b/lib/bdev/part.c index e1c54266b..3c5275053 100644 --- a/lib/bdev/part.c +++ b/lib/bdev/part.c @@ -38,7 +38,7 @@ #include "spdk/bdev.h" #include "spdk/log.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" void spdk_bdev_part_base_free(struct spdk_bdev_part_base *base) diff --git a/lib/bdev/passthru/vbdev_passthru.c b/lib/bdev/passthru/vbdev_passthru.c index df5da739b..9dd582e82 100755 --- a/lib/bdev/passthru/vbdev_passthru.c +++ b/lib/bdev/passthru/vbdev_passthru.c @@ -47,7 +47,7 @@ #include "spdk/io_channel.h" #include "spdk/util.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk_internal/log.h" diff --git a/lib/bdev/pmem/bdev_pmem.c b/lib/bdev/pmem/bdev_pmem.c index 54b283a6d..55b202e6e 100644 --- a/lib/bdev/pmem/bdev_pmem.c +++ b/lib/bdev/pmem/bdev_pmem.c @@ -36,7 +36,7 @@ #include "spdk/likely.h" #include "spdk/util.h" #include "spdk/rpc.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk_internal/log.h" #include "bdev_pmem.h" diff --git a/lib/bdev/rbd/bdev_rbd.c b/lib/bdev/rbd/bdev_rbd.c index 9b6c43557..b680be94b 100644 --- a/lib/bdev/rbd/bdev_rbd.c +++ b/lib/bdev/rbd/bdev_rbd.c @@ -47,7 +47,7 @@ #include "spdk/string.h" #include "spdk/util.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk_internal/log.h" #define SPDK_RBD_QUEUE_DEPTH 128 diff --git a/lib/bdev/rpc/bdev_rpc.c b/lib/bdev/rpc/bdev_rpc.c index 9589c104c..9cc8b95fc 100644 --- a/lib/bdev/rpc/bdev_rpc.c +++ b/lib/bdev/rpc/bdev_rpc.c @@ -36,7 +36,7 @@ #include "spdk/string.h" #include "spdk/util.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" struct rpc_get_bdevs_iostat_ctx { int bdev_count; diff --git a/lib/bdev/scsi_nvme.c b/lib/bdev/scsi_nvme.c index 6ee9d57d4..7f2b8cdeb 100644 --- a/lib/bdev/scsi_nvme.c +++ b/lib/bdev/scsi_nvme.c @@ -30,7 +30,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk/nvme_spec.h" diff --git a/lib/bdev/split/vbdev_split.c b/lib/bdev/split/vbdev_split.c index 542bd6c97..7785cc18a 100644 --- a/lib/bdev/split/vbdev_split.c +++ b/lib/bdev/split/vbdev_split.c @@ -45,7 +45,7 @@ #include "spdk/io_channel.h" #include "spdk/util.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk_internal/log.h" struct spdk_vbdev_split_config { diff --git a/lib/bdev/split/vbdev_split.h b/lib/bdev/split/vbdev_split.h index b57700f25..74ea062cf 100644 --- a/lib/bdev/split/vbdev_split.h +++ b/lib/bdev/split/vbdev_split.h @@ -34,7 +34,7 @@ #ifndef SPDK_VBDEV_SPLIT_H #define SPDK_VBDEV_SPLIT_H -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" /** * Add given disk name to split config. If bdev with \c base_bdev_name name diff --git a/lib/bdev/virtio/bdev_virtio_blk.c b/lib/bdev/virtio/bdev_virtio_blk.c index efe924222..23127f474 100644 --- a/lib/bdev/virtio/bdev_virtio_blk.c +++ b/lib/bdev/virtio/bdev_virtio_blk.c @@ -43,7 +43,7 @@ #include "spdk/json.h" #include "spdk_internal/assert.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk_internal/log.h" #include "spdk_internal/virtio.h" diff --git a/lib/bdev/virtio/bdev_virtio_scsi.c b/lib/bdev/virtio/bdev_virtio_scsi.c index 5a0a4e6fc..efed8d74b 100644 --- a/lib/bdev/virtio/bdev_virtio_scsi.c +++ b/lib/bdev/virtio/bdev_virtio_scsi.c @@ -43,7 +43,7 @@ #include "spdk/util.h" #include "spdk/json.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk_internal/log.h" #include "spdk_internal/virtio.h" diff --git a/lib/blob/bdev/blob_bdev.c b/lib/blob/bdev/blob_bdev.c index fbe516db2..bd4021403 100644 --- a/lib/blob/bdev/blob_bdev.c +++ b/lib/blob/bdev/blob_bdev.c @@ -38,7 +38,7 @@ #include "spdk/io_channel.h" #include "spdk/log.h" #include "spdk/endian.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" struct blob_bdev { struct spdk_bs_dev bs_dev; diff --git a/lib/nvmf/ctrlr_discovery.c b/lib/nvmf/ctrlr_discovery.c index a2fe5ec16..19b29e063 100644 --- a/lib/nvmf/ctrlr_discovery.c +++ b/lib/nvmf/ctrlr_discovery.c @@ -45,7 +45,7 @@ #include "spdk/trace.h" #include "spdk/nvmf_spec.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk_internal/log.h" static void diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c index 466f5aa85..7a050e05e 100644 --- a/lib/nvmf/subsystem.c +++ b/lib/nvmf/subsystem.c @@ -43,7 +43,7 @@ #include "spdk/nvmf_spec.h" #include "spdk/uuid.h" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk_internal/log.h" #include "spdk_internal/utf.h" diff --git a/lib/scsi/scsi_bdev.c b/lib/scsi/scsi_bdev.c index adefbbe8b..52f82454a 100644 --- a/lib/scsi/scsi_bdev.c +++ b/lib/scsi/scsi_bdev.c @@ -38,7 +38,7 @@ * TODO: move bdev SCSI error code translation tests to bdev unit test * and remove this include. */ -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk/env.h" #include "spdk/bdev.h" diff --git a/test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c b/test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c index a33fcdc65..7bcdaf08b 100644 --- a/test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c +++ b/test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c @@ -41,7 +41,7 @@ #include "vhost/vhost_blk.c" #include "unit/lib/vhost/test_vhost.c" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk/env.h" DEFINE_STUB(spdk_bdev_free_io, int, (struct spdk_bdev_io *bdev_io), 0); diff --git a/test/unit/lib/vhost/vhost_nvme.c/vhost_nvme_ut.c b/test/unit/lib/vhost/vhost_nvme.c/vhost_nvme_ut.c index eda8d7472..7e1cf551f 100644 --- a/test/unit/lib/vhost/vhost_nvme.c/vhost_nvme_ut.c +++ b/test/unit/lib/vhost/vhost_nvme.c/vhost_nvme_ut.c @@ -41,7 +41,7 @@ #include "vhost/vhost_nvme.c" #include "unit/lib/vhost/test_vhost.c" -#include "spdk_internal/bdev.h" +#include "spdk/bdev_module.h" #include "spdk/env.h"