diff options
| author | Keith Busch <keith.busch@intel.com> | 2014-12-03 17:07:13 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-12-03 19:10:45 -0700 |
| commit | 9af8785a38d4528d6675247f873b0f1ae29f3be8 (patch) | |
| tree | 65f7044e066a022c8d722e184ca1fcd2986b512f /drivers/block | |
| parent | 709c8667ada1fa26ac941bb875892afc0046b3e2 (diff) | |
| download | linux-9af8785a38d4528d6675247f873b0f1ae29f3be8.tar.bz2 | |
NVMe: Fix command setup on IO retry
On retry, the req->special is pointing to an already setup IOD, but we
still need to setup the command context and callback, otherwise you'll
see false twice completed errors and leak requests.
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/nvme-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index c7ea07ce9372..bcbdf832b1b0 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -640,8 +640,6 @@ static int nvme_queue_rq(struct blk_mq_hw_ctx *hctx, iod->private = req; req->special = iod; - nvme_set_info(cmd, iod, req_completion); - if (req->cmd_flags & REQ_DISCARD) { void *range; /* @@ -677,6 +675,7 @@ static int nvme_queue_rq(struct blk_mq_hw_ctx *hctx, blk_mq_start_request(req); submit_iod: + nvme_set_info(cmd, iod, req_completion); spin_lock_irq(&nvmeq->q_lock); if (req->cmd_flags & REQ_DISCARD) nvme_submit_discard(nvmeq, ns, req, iod); |