Commit 87b4d5ec authored by Wilfred Mallawa's avatar Wilfred Mallawa Committed by Christoph Hellwig
Browse files

nvmet: simplify the nvmet_req_init() interface 



Now that a submission queue holds a reference to its completion queue,
there is no need to pass the cq argument to nvmet_req_init(), so remove
it.

Signed-off-by: default avatarWilfred Mallawa <wilfred.mallawa@wdc.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 94ee8708

drivers/nvme/target/core.c

+3 −3
Original line number Diff line number Diff line
@@ -1156,13 +1156,13 @@ static u16 nvmet_parse_io_cmd(struct nvmet_req *req) 
	return ret;

}



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

		struct nvmet_sq *sq, const struct nvmet_fabrics_ops *ops)

bool nvmet_req_init(struct nvmet_req *req, struct nvmet_sq *sq,

		const struct nvmet_fabrics_ops *ops)

{

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

	u16 status;



	req->cq = cq;

	req->cq = sq->cq;

	req->sq = sq;

	req->ops = ops;

	req->sg = NULL;

drivers/nvme/target/fc.c

+2 −4
Original line number Diff line number Diff line
@@ -2534,9 +2534,7 @@ nvmet_fc_handle_fcp_rqst(struct nvmet_fc_tgtport *tgtport, 
	fod->data_sg = NULL;

	fod->data_sg_cnt = 0;



	ret = nvmet_req_init(&fod->req,

				&fod->queue->nvme_cq,

				&fod->queue->nvme_sq,

	ret = nvmet_req_init(&fod->req, &fod->queue->nvme_sq,

			&nvmet_fc_tgt_fcp_ops);

	if (!ret) {

		/* bad SQE content or invalid ctrl state */

drivers/nvme/target/loop.c

+2 −4
Original line number Diff line number Diff line
@@ -150,8 +150,7 @@ static blk_status_t nvme_loop_queue_rq(struct blk_mq_hw_ctx *hctx, 
	nvme_start_request(req);

	iod->cmd.common.flags |= NVME_CMD_SGL_METABUF;

	iod->req.port = queue->ctrl->port;

	if (!nvmet_req_init(&iod->req, &queue->nvme_cq,

			&queue->nvme_sq, &nvme_loop_ops))

	if (!nvmet_req_init(&iod->req, &queue->nvme_sq, &nvme_loop_ops))

		return BLK_STS_OK;



	if (blk_rq_nr_phys_segments(req)) {
@@ -183,8 +182,7 @@ static void nvme_loop_submit_async_event(struct nvme_ctrl *arg) 
	iod->cmd.common.command_id = NVME_AQ_BLK_MQ_DEPTH;

	iod->cmd.common.flags |= NVME_CMD_SGL_METABUF;



	if (!nvmet_req_init(&iod->req, &queue->nvme_cq, &queue->nvme_sq,

			&nvme_loop_ops)) {

	if (!nvmet_req_init(&iod->req, &queue->nvme_sq, &nvme_loop_ops)) {

		dev_err(ctrl->ctrl.device, "failed async event work\n");

		return;

	}

drivers/nvme/target/nvmet.h

+2 −2
Original line number Diff line number Diff line
@@ -561,8 +561,8 @@ u32 nvmet_fabrics_admin_cmd_data_len(struct nvmet_req *req); 
u16 nvmet_parse_fabrics_io_cmd(struct nvmet_req *req);

u32 nvmet_fabrics_io_cmd_data_len(struct nvmet_req *req);



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

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

bool nvmet_req_init(struct nvmet_req *req, struct nvmet_sq *sq,

		const struct nvmet_fabrics_ops *ops);

void nvmet_req_uninit(struct nvmet_req *req);

size_t nvmet_req_transfer_len(struct nvmet_req *req);

bool nvmet_check_transfer_len(struct nvmet_req *req, size_t len);

drivers/nvme/target/pci-epf.c

+1 −2
Original line number Diff line number Diff line
@@ -1597,8 +1597,7 @@ static void nvmet_pci_epf_exec_iod_work(struct work_struct *work) 
		goto complete;

	}



	if (!nvmet_req_init(req, &iod->cq->nvme_cq, &iod->sq->nvme_sq,

			    &nvmet_pci_epf_fabrics_ops))

	if (!nvmet_req_init(req, &iod->sq->nvme_sq, &nvmet_pci_epf_fabrics_ops))

		goto complete;



	iod->data_len = nvmet_req_transfer_len(req);