diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-04-05 19:18:09 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-05 12:05:08 -0600 |
| commit | f6324b1bb7f8d38c4f8be5509098e4b3ee0194b1 (patch) | |
| tree | 06f620272881a64cd8dc095515a9b951cb50b457 /drivers/nvme | |
| parent | 987f699a8f6c9a724e970c1bb4cde2e2c6a52010 (diff) | |
| download | linux-0-day-f6324b1bb7f8d38c4f8be5509098e4b3ee0194b1.tar.gz linux-0-day-f6324b1bb7f8d38c4f8be5509098e4b3ee0194b1.tar.xz | |
nvme: cleanup nvme_req_needs_retry
Don't pass the status explicitly but derive it from the requeust,
and unwind the complex condition to be more readable.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/core.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 0437f44d00f9d..b225aacf4b89c 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -67,11 +67,17 @@ static DEFINE_SPINLOCK(dev_list_lock); static struct class *nvme_class; -static inline bool nvme_req_needs_retry(struct request *req, u16 status) +static inline bool nvme_req_needs_retry(struct request *req) { - return !(status & NVME_SC_DNR || blk_noretry_request(req)) && - (jiffies - req->start_time) < req->timeout && - req->retries < nvme_max_retries; + if (blk_noretry_request(req)) + return false; + if (req->errors & NVME_SC_DNR) + return false; + if (jiffies - req->start_time >= req->timeout) + return false; + if (req->retries >= nvme_max_retries) + return false; + return true; } void nvme_complete_rq(struct request *req) @@ -79,7 +85,7 @@ void nvme_complete_rq(struct request *req) int error = 0; if (unlikely(req->errors)) { - if (nvme_req_needs_retry(req, req->errors)) { + if (nvme_req_needs_retry(req)) { req->retries++; blk_mq_requeue_request(req, !blk_mq_queue_stopped(req->q)); |