diff options
| author | Chaitanya Kulkarni <kch@nvidia.com> | 2022-03-30 02:40:32 -0700 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2022-05-16 08:07:25 +0200 |
| commit | 93ba75c90524618ef2c20979b0e660b9d071f0e6 (patch) | |
| tree | 559252d94463a7ac1d8ed7ec42cc205bc5e60473 /drivers/nvme/host/tcp.c | |
| parent | b98235d3a471e121376bfabce27380dde5add1d9 (diff) | |
| download | lwn-93ba75c90524618ef2c20979b0e660b9d071f0e6.tar.gz lwn-93ba75c90524618ef2c20979b0e660b9d071f0e6.zip | |
nvme-fabrics: add a request timeout helper
The RDAMA and TCP transport both complete the timed out request in the
same manner and hence code is duplicated. Add and use the helper
nvmf_complete_timed_out_request() to remove the duplicate code.
Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme/host/tcp.c')
| -rw-r--r-- | drivers/nvme/host/tcp.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index ad3a2bf2f1e9..bb67538d241b 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -2318,10 +2318,7 @@ static void nvme_tcp_complete_timed_out(struct request *rq) struct nvme_ctrl *ctrl = &req->queue->ctrl->ctrl; nvme_tcp_stop_queue(ctrl, nvme_tcp_queue_id(req->queue)); - if (blk_mq_request_started(rq) && !blk_mq_request_completed(rq)) { - nvme_req(rq)->status = NVME_SC_HOST_ABORTED_CMD; - blk_mq_complete_request(rq); - } + nvmf_complete_timed_out_request(rq); } static enum blk_eh_timer_return |