Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e929f06d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvmet: constify struct nvmet_fabrics_ops 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a5d18612

drivers/nvme/target/core.c

+6 −6
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#include "nvmet.h"



static struct nvmet_fabrics_ops *nvmet_transports[NVMF_TRTYPE_MAX];

static const struct nvmet_fabrics_ops *nvmet_transports[NVMF_TRTYPE_MAX];

static DEFINE_IDA(cntlid_ida);



/*
@@ -137,7 +137,7 @@ static void nvmet_add_async_event(struct nvmet_ctrl *ctrl, u8 event_type, 
	schedule_work(&ctrl->async_event_work);

}



int nvmet_register_transport(struct nvmet_fabrics_ops *ops)

int nvmet_register_transport(const struct nvmet_fabrics_ops *ops)

{

	int ret = 0;
@@ -152,7 +152,7 @@ int nvmet_register_transport(struct nvmet_fabrics_ops *ops) 
}

EXPORT_SYMBOL_GPL(nvmet_register_transport);



void nvmet_unregister_transport(struct nvmet_fabrics_ops *ops)

void nvmet_unregister_transport(const struct nvmet_fabrics_ops *ops)

{

	down_write(&nvmet_config_sem);

	nvmet_transports[ops->type] = NULL;
@@ -162,7 +162,7 @@ EXPORT_SYMBOL_GPL(nvmet_unregister_transport); 


int nvmet_enable_port(struct nvmet_port *port)

{

	struct nvmet_fabrics_ops *ops;

	const struct nvmet_fabrics_ops *ops;

	int ret;



	lockdep_assert_held(&nvmet_config_sem);
@@ -195,7 +195,7 @@ int nvmet_enable_port(struct nvmet_port *port) 


void nvmet_disable_port(struct nvmet_port *port)

{

	struct nvmet_fabrics_ops *ops;

	const struct nvmet_fabrics_ops *ops;



	lockdep_assert_held(&nvmet_config_sem);
@@ -500,7 +500,7 @@ int nvmet_sq_init(struct nvmet_sq *sq) 
EXPORT_SYMBOL_GPL(nvmet_sq_init);



bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq,

		struct nvmet_sq *sq, struct nvmet_fabrics_ops *ops)

		struct nvmet_sq *sq, const struct nvmet_fabrics_ops *ops)

{

	u8 flags = req->cmd->common.flags;

	u16 status;

drivers/nvme/target/fc.c

+2 −2
Original line number Diff line number Diff line
@@ -1563,7 +1563,7 @@ nvmet_fc_ls_disconnect(struct nvmet_fc_tgtport *tgtport, 


static void nvmet_fc_fcp_nvme_cmd_done(struct nvmet_req *nvme_req);



static struct nvmet_fabrics_ops nvmet_fc_tgt_fcp_ops;

static const struct nvmet_fabrics_ops nvmet_fc_tgt_fcp_ops;



static void

nvmet_fc_xmt_ls_rsp_done(struct nvmefc_tgt_ls_req *lsreq)
@@ -2518,7 +2518,7 @@ nvmet_fc_remove_port(struct nvmet_port *port) 
	/* nothing to do */

}



static struct nvmet_fabrics_ops nvmet_fc_tgt_fcp_ops = {

static const struct nvmet_fabrics_ops nvmet_fc_tgt_fcp_ops = {

	.owner			= THIS_MODULE,

	.type			= NVMF_TRTYPE_FC,

	.msdbd			= 1,

drivers/nvme/target/loop.c

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static DEFINE_MUTEX(nvme_loop_ctrl_mutex); 
static void nvme_loop_queue_response(struct nvmet_req *nvme_req);

static void nvme_loop_delete_ctrl(struct nvmet_ctrl *ctrl);



static struct nvmet_fabrics_ops nvme_loop_ops;

static const struct nvmet_fabrics_ops nvme_loop_ops;



static inline int nvme_loop_queue_idx(struct nvme_loop_queue *queue)

{
@@ -675,7 +675,7 @@ static void nvme_loop_remove_port(struct nvmet_port *port) 
		nvmet_loop_port = NULL;

}



static struct nvmet_fabrics_ops nvme_loop_ops = {

static const struct nvmet_fabrics_ops nvme_loop_ops = {

	.owner		= THIS_MODULE,

	.type		= NVMF_TRTYPE_LOOP,

	.add_port	= nvme_loop_add_port,

drivers/nvme/target/nvmet.h

+5 −5
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ struct nvmet_ctrl { 
	struct delayed_work	ka_work;

	struct work_struct	fatal_err_work;



	struct nvmet_fabrics_ops *ops;

	const struct nvmet_fabrics_ops *ops;



	char			subsysnqn[NVMF_NQN_FIELD_LEN];

	char			hostnqn[NVMF_NQN_FIELD_LEN];
@@ -233,7 +233,7 @@ struct nvmet_req { 
	struct nvmet_port	*port;



	void (*execute)(struct nvmet_req *req);

	struct nvmet_fabrics_ops *ops;

	const struct nvmet_fabrics_ops *ops;

};



static inline void nvmet_set_status(struct nvmet_req *req, u16 status)
@@ -269,7 +269,7 @@ u16 nvmet_parse_discovery_cmd(struct nvmet_req *req); 
u16 nvmet_parse_fabrics_cmd(struct nvmet_req *req);



bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq,

		struct nvmet_sq *sq, struct nvmet_fabrics_ops *ops);

		struct nvmet_sq *sq, const struct nvmet_fabrics_ops *ops);

void nvmet_req_uninit(struct nvmet_req *req);

void nvmet_req_execute(struct nvmet_req *req);

void nvmet_req_complete(struct nvmet_req *req, u16 status);
@@ -303,8 +303,8 @@ void nvmet_ns_disable(struct nvmet_ns *ns); 
struct nvmet_ns *nvmet_ns_alloc(struct nvmet_subsys *subsys, u32 nsid);

void nvmet_ns_free(struct nvmet_ns *ns);



int nvmet_register_transport(struct nvmet_fabrics_ops *ops);

void nvmet_unregister_transport(struct nvmet_fabrics_ops *ops);

int nvmet_register_transport(const struct nvmet_fabrics_ops *ops);

void nvmet_unregister_transport(const struct nvmet_fabrics_ops *ops);



int nvmet_enable_port(struct nvmet_port *port);

void nvmet_disable_port(struct nvmet_port *port);

drivers/nvme/target/rdma.c

+2 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static void nvmet_rdma_read_data_done(struct ib_cq *cq, struct ib_wc *wc); 
static void nvmet_rdma_qp_event(struct ib_event *event, void *priv);

static void nvmet_rdma_queue_disconnect(struct nvmet_rdma_queue *queue);



static struct nvmet_fabrics_ops nvmet_rdma_ops;

static const struct nvmet_fabrics_ops nvmet_rdma_ops;



/* XXX: really should move to a generic header sooner or later.. */

static inline u32 get_unaligned_le24(const u8 *p)
@@ -1453,7 +1453,7 @@ static void nvmet_rdma_disc_port_addr(struct nvmet_req *req, 
	}

}



static struct nvmet_fabrics_ops nvmet_rdma_ops = {

static const struct nvmet_fabrics_ops nvmet_rdma_ops = {

	.owner			= THIS_MODULE,

	.type			= NVMF_TRTYPE_RDMA,

	.sqe_inline_size	= NVMET_RDMA_INLINE_DATA_SIZE,