Commit 987f699a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 8e14be53
......@@ -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:
......
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment