| Message ID | 20170405171812.19911-2-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
On Wed, Apr 05, 2017 at 07:18:08PM +0200, Christoph Hellwig wrote: > ->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> > --- Thanks a lot. Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 3c908e1bc903..0437f44d00f9 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -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: diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 9e686a67d93b..3818ab15a26e 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -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; }
->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> --- drivers/nvme/host/core.c | 5 +++++ drivers/nvme/host/pci.c | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-)