diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-05-29 15:52:30 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-05-29 16:59:21 +0200 |
| commit | db8c48e4b2fa7c7ad1e429fe980e787698033ee9 (patch) | |
| tree | 7464e440edf914f534d6bf575051c55745dc7218 /drivers/nvme/host/rdma.c | |
| parent | block: rename BLK_EH_NOT_HANDLED to BLK_EH_DONE (diff) | |
| download | linux-db8c48e4b2fa7c7ad1e429fe980e787698033ee9.tar.xz linux-db8c48e4b2fa7c7ad1e429fe980e787698033ee9.zip | |
nvme: return BLK_EH_DONE from ->timeout
NVMe always completes the request before returning from ->timeout, either
by polling for it, or by disabling the controller. Return BLK_EH_DONE so
that the block layer doesn't even try to complete it again.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/nvme/host/rdma.c')
| -rw-r--r-- | drivers/nvme/host/rdma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 1eb4438a8763..ac7462cd7f0f 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1598,7 +1598,7 @@ nvme_rdma_timeout(struct request *rq, bool reserved) /* fail with DNR on cmd timeout */ nvme_req(rq)->status = NVME_SC_ABORT_REQ | NVME_SC_DNR; - return BLK_EH_HANDLED; + return BLK_EH_DONE; } static blk_status_t nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx, |