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 <benjamin.walker@intel.com> Reviewed-on: https://review.gerrithub.io/412297 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
parent
9a7d4d53b3
commit
bcff4c89b8
@ -38,7 +38,7 @@
|
|||||||
#include "spdk/event.h"
|
#include "spdk/event.h"
|
||||||
#include "spdk/log.h"
|
#include "spdk/log.h"
|
||||||
#include "spdk/string.h"
|
#include "spdk/string.h"
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
|
|
||||||
static char *g_bdev_name = "Malloc0";
|
static char *g_bdev_name = "Malloc0";
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
#include "spdk/blob.h"
|
#include "spdk/blob.h"
|
||||||
#include "spdk/lvol.h"
|
#include "spdk/lvol.h"
|
||||||
#include "spdk/uuid.h"
|
#include "spdk/uuid.h"
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
|
|
||||||
/* Default size of blobstore cluster */
|
/* Default size of blobstore cluster */
|
||||||
#define SPDK_LVS_OPTS_CLUSTER_SZ (4 * 1024 * 1024)
|
#define SPDK_LVS_OPTS_CLUSTER_SZ (4 * 1024 * 1024)
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
#include "spdk/queue.h"
|
#include "spdk/queue.h"
|
||||||
#include "spdk/bdev.h"
|
#include "spdk/bdev.h"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
|
|
||||||
struct bdev_aio_task {
|
struct bdev_aio_task {
|
||||||
struct iocb iocb;
|
struct iocb iocb;
|
||||||
|
@ -46,7 +46,7 @@
|
|||||||
#include "spdk/scsi_spec.h"
|
#include "spdk/scsi_spec.h"
|
||||||
#include "spdk/util.h"
|
#include "spdk/util.h"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
#include "spdk/string.h"
|
#include "spdk/string.h"
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
#include "spdk/nvme_spec.h"
|
#include "spdk/nvme_spec.h"
|
||||||
#include "spdk/string.h"
|
#include "spdk/string.h"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
|
|
||||||
#include "vbdev_error.h"
|
#include "vbdev_error.h"
|
||||||
|
@ -46,7 +46,7 @@
|
|||||||
#include "spdk/string.h"
|
#include "spdk/string.h"
|
||||||
#include "spdk/util.h"
|
#include "spdk/util.h"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
|
|
||||||
static int vbdev_gpt_init(void);
|
static int vbdev_gpt_init(void);
|
||||||
|
@ -44,7 +44,7 @@
|
|||||||
#include "spdk/string.h"
|
#include "spdk/string.h"
|
||||||
|
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
|
|
||||||
#include "iscsi/iscsi.h"
|
#include "iscsi/iscsi.h"
|
||||||
#include "iscsi/scsi-lowlevel.h"
|
#include "iscsi/scsi-lowlevel.h"
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
#include "spdk/blob_bdev.h"
|
#include "spdk/blob_bdev.h"
|
||||||
#include "spdk/rpc.h"
|
#include "spdk/rpc.h"
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
#include "spdk/string.h"
|
#include "spdk/string.h"
|
||||||
#include "spdk/uuid.h"
|
#include "spdk/uuid.h"
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
#define SPDK_VBDEV_LVOL_H
|
#define SPDK_VBDEV_LVOL_H
|
||||||
|
|
||||||
#include "spdk/lvol.h"
|
#include "spdk/lvol.h"
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
|
|
||||||
#include "spdk_internal/lvolstore.h"
|
#include "spdk_internal/lvolstore.h"
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
#include "spdk/queue.h"
|
#include "spdk/queue.h"
|
||||||
#include "spdk/string.h"
|
#include "spdk/string.h"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
|
|
||||||
struct malloc_disk {
|
struct malloc_disk {
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
#include "spdk/io_channel.h"
|
#include "spdk/io_channel.h"
|
||||||
#include "spdk/json.h"
|
#include "spdk/json.h"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
|
|
||||||
#include "bdev_null.h"
|
#include "bdev_null.h"
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
#include "spdk/rpc.h"
|
#include "spdk/rpc.h"
|
||||||
#include "spdk/util.h"
|
#include "spdk/util.h"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
|
|
||||||
#include "bdev_null.h"
|
#include "bdev_null.h"
|
||||||
|
@ -46,7 +46,7 @@
|
|||||||
#include "spdk/likely.h"
|
#include "spdk/likely.h"
|
||||||
#include "spdk/util.h"
|
#include "spdk/util.h"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
|
|
||||||
static void bdev_nvme_get_spdk_running_config(FILE *fp);
|
static void bdev_nvme_get_spdk_running_config(FILE *fp);
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
#include "spdk/util.h"
|
#include "spdk/util.h"
|
||||||
|
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
|
|
||||||
struct open_descriptors {
|
struct open_descriptors {
|
||||||
void *desc;
|
void *desc;
|
||||||
|
@ -38,7 +38,7 @@
|
|||||||
#include "spdk/bdev.h"
|
#include "spdk/bdev.h"
|
||||||
#include "spdk/log.h"
|
#include "spdk/log.h"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
|
|
||||||
void
|
void
|
||||||
spdk_bdev_part_base_free(struct spdk_bdev_part_base *base)
|
spdk_bdev_part_base_free(struct spdk_bdev_part_base *base)
|
||||||
|
@ -47,7 +47,7 @@
|
|||||||
#include "spdk/io_channel.h"
|
#include "spdk/io_channel.h"
|
||||||
#include "spdk/util.h"
|
#include "spdk/util.h"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
|
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
#include "spdk/likely.h"
|
#include "spdk/likely.h"
|
||||||
#include "spdk/util.h"
|
#include "spdk/util.h"
|
||||||
#include "spdk/rpc.h"
|
#include "spdk/rpc.h"
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
|
|
||||||
#include "bdev_pmem.h"
|
#include "bdev_pmem.h"
|
||||||
|
@ -47,7 +47,7 @@
|
|||||||
#include "spdk/string.h"
|
#include "spdk/string.h"
|
||||||
#include "spdk/util.h"
|
#include "spdk/util.h"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
|
|
||||||
#define SPDK_RBD_QUEUE_DEPTH 128
|
#define SPDK_RBD_QUEUE_DEPTH 128
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
#include "spdk/string.h"
|
#include "spdk/string.h"
|
||||||
#include "spdk/util.h"
|
#include "spdk/util.h"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
|
|
||||||
struct rpc_get_bdevs_iostat_ctx {
|
struct rpc_get_bdevs_iostat_ctx {
|
||||||
int bdev_count;
|
int bdev_count;
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* 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"
|
#include "spdk/nvme_spec.h"
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
#include "spdk/io_channel.h"
|
#include "spdk/io_channel.h"
|
||||||
#include "spdk/util.h"
|
#include "spdk/util.h"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
|
|
||||||
struct spdk_vbdev_split_config {
|
struct spdk_vbdev_split_config {
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
#ifndef SPDK_VBDEV_SPLIT_H
|
#ifndef SPDK_VBDEV_SPLIT_H
|
||||||
#define 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
|
* Add given disk name to split config. If bdev with \c base_bdev_name name
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
#include "spdk/json.h"
|
#include "spdk/json.h"
|
||||||
|
|
||||||
#include "spdk_internal/assert.h"
|
#include "spdk_internal/assert.h"
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
#include "spdk_internal/virtio.h"
|
#include "spdk_internal/virtio.h"
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
#include "spdk/util.h"
|
#include "spdk/util.h"
|
||||||
#include "spdk/json.h"
|
#include "spdk/json.h"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
#include "spdk_internal/virtio.h"
|
#include "spdk_internal/virtio.h"
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@
|
|||||||
#include "spdk/io_channel.h"
|
#include "spdk/io_channel.h"
|
||||||
#include "spdk/log.h"
|
#include "spdk/log.h"
|
||||||
#include "spdk/endian.h"
|
#include "spdk/endian.h"
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
|
|
||||||
struct blob_bdev {
|
struct blob_bdev {
|
||||||
struct spdk_bs_dev bs_dev;
|
struct spdk_bs_dev bs_dev;
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
#include "spdk/trace.h"
|
#include "spdk/trace.h"
|
||||||
#include "spdk/nvmf_spec.h"
|
#include "spdk/nvmf_spec.h"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
#include "spdk/nvmf_spec.h"
|
#include "spdk/nvmf_spec.h"
|
||||||
#include "spdk/uuid.h"
|
#include "spdk/uuid.h"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk_internal/log.h"
|
#include "spdk_internal/log.h"
|
||||||
#include "spdk_internal/utf.h"
|
#include "spdk_internal/utf.h"
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@
|
|||||||
* TODO: move bdev SCSI error code translation tests to bdev unit test
|
* TODO: move bdev SCSI error code translation tests to bdev unit test
|
||||||
* and remove this include.
|
* and remove this include.
|
||||||
*/
|
*/
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
|
|
||||||
#include "spdk/env.h"
|
#include "spdk/env.h"
|
||||||
#include "spdk/bdev.h"
|
#include "spdk/bdev.h"
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
#include "vhost/vhost_blk.c"
|
#include "vhost/vhost_blk.c"
|
||||||
#include "unit/lib/vhost/test_vhost.c"
|
#include "unit/lib/vhost/test_vhost.c"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk/env.h"
|
#include "spdk/env.h"
|
||||||
|
|
||||||
DEFINE_STUB(spdk_bdev_free_io, int, (struct spdk_bdev_io *bdev_io), 0);
|
DEFINE_STUB(spdk_bdev_free_io, int, (struct spdk_bdev_io *bdev_io), 0);
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
#include "vhost/vhost_nvme.c"
|
#include "vhost/vhost_nvme.c"
|
||||||
#include "unit/lib/vhost/test_vhost.c"
|
#include "unit/lib/vhost/test_vhost.c"
|
||||||
|
|
||||||
#include "spdk_internal/bdev.h"
|
#include "spdk/bdev_module.h"
|
||||||
#include "spdk/env.h"
|
#include "spdk/env.h"
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user