Commit 47c7470d authored by Liu Xiaodong's avatar Liu Xiaodong Committed by Changpeng Liu
Browse files

spdk_ioctl: define nvme_ctrlr/bdev in internal .h 

Prepare to insert ioctl related struct and funcs
into lib/bdev/nvme.
This is the start of one set of patches for nvme
ioctl. More details will be put in Trello:
https://trello.com/c/UYL5vhTN/50-nvme-userioctl



Change-Id: I5fc97230400ecab79f19dac4fb2badfd2d337f6c
Signed-off-by: default avatarLiu Xiaodong <xiaodong.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/412781


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 5627cfd0

lib/bdev/nvme/bdev_nvme.c

+0 −25
Original line number Diff line number Diff line
@@ -52,31 +52,6 @@ 
static void bdev_nvme_get_spdk_running_config(FILE *fp);

static int bdev_nvme_config_json(struct spdk_json_write_ctx *w);



struct nvme_ctrlr {

	/**

	 * points to pinned, physically contiguous memory region;

	 * contains 4KB IDENTIFY structure for controller which is

	 *  target for CONTROLLER IDENTIFY command during initialization

	 */

	struct spdk_nvme_ctrlr		*ctrlr;

	struct spdk_nvme_transport_id	trid;

	char				*name;

	int				ref;



	struct spdk_poller		*adminq_timer_poller;



	/** linked list pointer for device list */

	TAILQ_ENTRY(nvme_ctrlr)	tailq;

};



struct nvme_bdev {

	struct spdk_bdev	disk;

	struct nvme_ctrlr	*nvme_ctrlr;

	struct spdk_nvme_ns	*ns;



	TAILQ_ENTRY(nvme_bdev)	link;

};



struct nvme_io_channel {

	struct spdk_nvme_qpair	*qpair;

	struct spdk_poller	*poller;

lib/bdev/nvme/bdev_nvme.h

+26 −1
Original line number Diff line number Diff line
@@ -36,11 +36,36 @@ 


#include "spdk/stdinc.h"



#include "spdk/queue.h"

#include "spdk/nvme.h"

#include "spdk/bdev_module.h"



#define NVME_MAX_CONTROLLERS 1024



struct spdk_bdev;

struct nvme_ctrlr {

	/**

	 * points to pinned, physically contiguous memory region;

	 * contains 4KB IDENTIFY structure for controller which is

	 *  target for CONTROLLER IDENTIFY command during initialization

	 */

	struct spdk_nvme_ctrlr		*ctrlr;

	struct spdk_nvme_transport_id	trid;

	char				*name;

	int				ref;



	struct spdk_poller		*adminq_timer_poller;



	/** linked list pointer for device list */

	TAILQ_ENTRY(nvme_ctrlr)	tailq;

};



struct nvme_bdev {

	struct spdk_bdev	disk;

	struct nvme_ctrlr	*nvme_ctrlr;

	struct spdk_nvme_ns	*ns;



	TAILQ_ENTRY(nvme_bdev)	link;

};



int spdk_bdev_nvme_create(struct spdk_nvme_transport_id *trid,

			  const char *base_name,