redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

nvme: move ->retries setup to nvme_setup_cmd 

->retries is counting the number of times a command is resubmitted, and
be cleared on the first time we see the command.  We currently don't do
that for non-PCIe command, which is easily fixed by moving the setup
to common code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
hifive-unleashed-5.1
Christoph Hellwig 2017-04-05 19:18:08 +02:00 committed by Jens Axboe
parent 8e14be53f4
commit 987f699a8f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/nvme/host/core.c
View File

@ -350,6 +350,11 @@ int nvme_setup_cmd(struct nvme_ns *ns, struct request *req,
{
int ret = BLK_MQ_RQ_QUEUE_OK;
if (!(req->rq_flags & RQF_DONTPREP)) {
req->retries = 0;
req->rq_flags |= RQF_DONTPREP;
}
switch (req_op(req)) {
case REQ_OP_DRV_IN:
case REQ_OP_DRV_OUT:

4
drivers/nvme/host/pci.c
View File

@ -326,10 +326,6 @@ static int nvme_init_iod(struct request *rq, struct nvme_dev *dev)
iod->nents = 0;
iod->length = size;
if (!(rq->rq_flags & RQF_DONTPREP)) {
rq->retries = 0;
rq->rq_flags |= RQF_DONTPREP;
}
return BLK_MQ_RQ_QUEUE_OK;
}