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

nvmet: Open code nvmet_req_execute() 



Now that nvmet_req_execute does nothing, open code it.

Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
[split patch, update changelog]
Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e9061c39

drivers/nvme/target/core.c

+0 −6
Original line number Diff line number Diff line
@@ -942,12 +942,6 @@ bool nvmet_check_data_len(struct nvmet_req *req, size_t data_len) 
}

EXPORT_SYMBOL_GPL(nvmet_check_data_len);



void nvmet_req_execute(struct nvmet_req *req)

{

	req->execute(req);

}

EXPORT_SYMBOL_GPL(nvmet_req_execute);



int nvmet_req_alloc_sgl(struct nvmet_req *req)

{

	struct pci_dev *p2p_dev = NULL;

drivers/nvme/target/fc.c

+2 −2
Original line number Diff line number Diff line
@@ -2018,7 +2018,7 @@ nvmet_fc_fod_op_done(struct nvmet_fc_fcp_iod *fod) 
		}



		/* data transfer complete, resume with nvmet layer */

		nvmet_req_execute(&fod->req);

		fod->req.execute(&fod->req);

		break;



	case NVMET_FCOP_READDATA:
@@ -2234,7 +2234,7 @@ nvmet_fc_handle_fcp_rqst(struct nvmet_fc_tgtport *tgtport, 
	 * can invoke the nvmet_layer now. If read data, cmd completion will

	 * push the data

	 */

	nvmet_req_execute(&fod->req);

	fod->req.execute(&fod->req);

	return;



transport_error:

drivers/nvme/target/loop.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void nvme_loop_execute_work(struct work_struct *work) 
	struct nvme_loop_iod *iod =

		container_of(work, struct nvme_loop_iod, work);



	nvmet_req_execute(&iod->req);

	iod->req.execute(&iod->req);

}



static blk_status_t nvme_loop_queue_rq(struct blk_mq_hw_ctx *hctx,

drivers/nvme/target/nvmet.h

+0 −1
Original line number Diff line number Diff line
@@ -374,7 +374,6 @@ bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq, 
		struct nvmet_sq *sq, const struct nvmet_fabrics_ops *ops);

void nvmet_req_uninit(struct nvmet_req *req);

bool nvmet_check_data_len(struct nvmet_req *req, size_t data_len);

void nvmet_req_execute(struct nvmet_req *req);

void nvmet_req_complete(struct nvmet_req *req, u16 status);

int nvmet_req_alloc_sgl(struct nvmet_req *req);

void nvmet_req_free_sgl(struct nvmet_req *req);

drivers/nvme/target/rdma.c

+2 −2
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ static void nvmet_rdma_read_data_done(struct ib_cq *cq, struct ib_wc *wc) 
		return;

	}



	nvmet_req_execute(&rsp->req);

	rsp->req.execute(&rsp->req);

}



static void nvmet_rdma_use_inline_sg(struct nvmet_rdma_rsp *rsp, u32 len,
@@ -746,7 +746,7 @@ static bool nvmet_rdma_execute_command(struct nvmet_rdma_rsp *rsp) 
				queue->cm_id->port_num, &rsp->read_cqe, NULL))

			nvmet_req_complete(&rsp->req, NVME_SC_DATA_XFER_ERROR);

	} else {

		nvmet_req_execute(&rsp->req);

		rsp->req.execute(&rsp->req);

	}



	return true;

CRA Git | Maintained and supported by SUSTech CRA and CCSE