diff options
| author |   Christoph Hellwig <hch@lst.de> | 2015-11-28 15:41:58 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@fb.com> | 2015-12-22 09:38:34 -0700 |
| commit | 7688faa6dd2c99ce5d66571d9ad65535ec39e8cb (patch) | |
| tree | c7e225f067d931754c400635cde063dba49e0ed1 /drivers/nvme/host/pci.c | |
| parent | nvme: fix admin queue depth (diff) | |
| download | linux-dev-7688faa6dd2c99ce5d66571d9ad65535ec39e8cb.tar.xz linux-dev-7688faa6dd2c99ce5d66571d9ad65535ec39e8cb.zip | |
nvme: factor out a few helpers from req_completion
We'll need them in other places later.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme/host/pci.c')
| -rw-r--r-- | drivers/nvme/host/pci.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 686a4e230841..808fb7355603 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -607,17 +607,9 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx, int error = 0; if (unlikely(status)) { - if (!(status & NVME_SC_DNR || blk_noretry_request(req)) - && (jiffies - req->start_time) < req->timeout) { - unsigned long flags; - + if (nvme_req_needs_retry(req, status)) { nvme_unmap_data(nvmeq->dev, iod); - - blk_mq_requeue_request(req); - spin_lock_irqsave(req->q->queue_lock, flags); - if (!blk_queue_stopped(req->q)) - blk_mq_kick_requeue_list(req->q); - spin_unlock_irqrestore(req->q->queue_lock, flags); + nvme_requeue_req(req); return; } |