Commit d3d5b87d authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme: replace is_flags field in nvme_ctrl_ops with a flags field 



So that we can have more flags for transport-specific behavior.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
parent 9bdcfb10

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1605,7 +1605,7 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) 
	}

	memcpy(ctrl->psd, id->psd, sizeof(ctrl->psd));



	if (ctrl->ops->is_fabrics) {

	if (ctrl->ops->flags & NVME_F_FABRICS) {

		ctrl->icdoff = le16_to_cpu(id->icdoff);

		ctrl->ioccsz = le32_to_cpu(id->ioccsz);

		ctrl->iorcsz = le32_to_cpu(id->iorcsz);

drivers/nvme/host/fc.c

+1 −1
Original line number Diff line number Diff line
@@ -2647,7 +2647,7 @@ nvme_fc_reset_nvme_ctrl(struct nvme_ctrl *nctrl) 
static const struct nvme_ctrl_ops nvme_fc_ctrl_ops = {

	.name			= "fc",

	.module			= THIS_MODULE,

	.is_fabrics		= true,

	.flags			= NVME_F_FABRICS,

	.reg_read32		= nvmf_reg_read32,

	.reg_read64		= nvmf_reg_read64,

	.reg_write32		= nvmf_reg_write32,

drivers/nvme/host/nvme.h

+2 −1
Original line number Diff line number Diff line
@@ -208,7 +208,8 @@ struct nvme_ns { 
struct nvme_ctrl_ops {

	const char *name;

	struct module *module;

	bool is_fabrics;

	unsigned int flags;

#define NVME_F_FABRICS			(1 << 0)

	int (*reg_read32)(struct nvme_ctrl *ctrl, u32 off, u32 *val);

	int (*reg_write32)(struct nvme_ctrl *ctrl, u32 off, u32 val);

	int (*reg_read64)(struct nvme_ctrl *ctrl, u32 off, u64 *val);

drivers/nvme/host/rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -1792,7 +1792,7 @@ static int nvme_rdma_reset_ctrl(struct nvme_ctrl *nctrl) 
static const struct nvme_ctrl_ops nvme_rdma_ctrl_ops = {

	.name			= "rdma",

	.module			= THIS_MODULE,

	.is_fabrics		= true,

	.flags			= NVME_F_FABRICS,

	.reg_read32		= nvmf_reg_read32,

	.reg_read64		= nvmf_reg_read64,

	.reg_write32		= nvmf_reg_write32,

drivers/nvme/target/loop.c

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ static int nvme_loop_reset_ctrl(struct nvme_ctrl *nctrl) 
static const struct nvme_ctrl_ops nvme_loop_ctrl_ops = {

	.name			= "loop",

	.module			= THIS_MODULE,

	.is_fabrics		= true,

	.flags			= NVME_F_FABRICS,

	.reg_read32		= nvmf_reg_read32,

	.reg_read64		= nvmf_reg_read64,

	.reg_write32		= nvmf_reg_write32,