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>
This commit is contained in:

committed by
Jens Axboe

parent
4bca70d067
commit
77f02a7acd
@@ -91,25 +91,10 @@ static inline int nvme_loop_queue_idx(struct nvme_loop_queue *queue)
|
||||
static void nvme_loop_complete_rq(struct request *req)
|
||||
{
|
||||
struct nvme_loop_iod *iod = blk_mq_rq_to_pdu(req);
|
||||
int error = 0;
|
||||
|
||||
nvme_cleanup_cmd(req);
|
||||
sg_free_table_chained(&iod->sg_table, true);
|
||||
|
||||
if (unlikely(req->errors)) {
|
||||
if (nvme_req_needs_retry(req, req->errors)) {
|
||||
req->retries++;
|
||||
nvme_requeue_req(req);
|
||||
return;
|
||||
}
|
||||
|
||||
if (blk_rq_is_passthrough(req))
|
||||
error = req->errors;
|
||||
else
|
||||
error = nvme_error_status(req->errors);
|
||||
}
|
||||
|
||||
blk_mq_end_request(req, error);
|
||||
nvme_complete_rq(req);
|
||||
}
|
||||
|
||||
static struct blk_mq_tags *nvme_loop_tagset(struct nvme_loop_queue *queue)
|
||||
|
Reference in New Issue
Block a user