Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6324b1b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 987f699a

drivers/nvme/host/core.c

+11 −5
Original line number Diff line number Diff line
@@ -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));