diff options
| author | Christoph Hellwig | 2017-03-30 13:41:32 +0200 |
|---|---|---|
| committer | Jens Axboe | 2017-04-04 17:48:23 +0200 |
| commit | 77f02a7acd7654cd5944f2120831d1eace94b343 (patch) | |
| tree | bee45db17a2a2f705c939f0769671008c3b3fda3 /drivers/nvme/host/rdma.c | |
| parent | nvme-fc: drop ctrl for all command completions (diff) | |
| download | kernel-qcow2-linux-77f02a7acd7654cd5944f2120831d1eace94b343.tar.gz kernel-qcow2-linux-77f02a7acd7654cd5944f2120831d1eace94b343.tar.xz kernel-qcow2-linux-77f02a7acd7654cd5944f2120831d1eace94b343.zip | |
nvme: factor request completion code into a common helper
This avoids duplicating the logic four times, and it also allows to keep
some helpers static in core.c or just opencode them.
Note that this loses printing the aborted status on completions in the
PCI driver as that uses a data structure not available any more.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme/host/rdma.c')
| -rw-r--r-- | drivers/nvme/host/rdma.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index a4608c362292..4aae363943e3 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1518,25 +1518,9 @@ static int nvme_rdma_poll(struct blk_mq_hw_ctx *hctx, unsigned int tag) static void nvme_rdma_complete_rq(struct request *rq) { struct nvme_rdma_request *req = blk_mq_rq_to_pdu(rq); - struct nvme_rdma_queue *queue = req->queue; - int error = 0; - nvme_rdma_unmap_data(queue, rq); - - if (unlikely(rq->errors)) { - if (nvme_req_needs_retry(rq, rq->errors)) { - rq->retries++; - nvme_requeue_req(rq); - return; - } - - if (blk_rq_is_passthrough(rq)) - error = rq->errors; - else - error = nvme_error_status(rq->errors); - } - - blk_mq_end_request(rq, error); + nvme_rdma_unmap_data(req->queue, rq); + nvme_complete_rq(rq); } static const struct blk_mq_ops nvme_rdma_mq_ops = { |