summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorSam Bradshaw2014-12-10 21:00:31 +0100
committerJens Axboe2014-12-10 21:00:31 +0100
commitc87fd5407e1aa1cfc6b393b03bf67010cf643dbe (patch)
tree928d7c759ee3c5d06958ad54be2cbc94d60eeac6 /drivers/block
parentNVMe: Fix command setup on IO retry (diff)
downloadkernel-qcow2-linux-c87fd5407e1aa1cfc6b393b03bf67010cf643dbe.tar.gz
kernel-qcow2-linux-c87fd5407e1aa1cfc6b393b03bf67010cf643dbe.tar.xz
kernel-qcow2-linux-c87fd5407e1aa1cfc6b393b03bf67010cf643dbe.zip
NVMe: fix freeing of wrong request in abort path
We allocate 'abort_req', but free 'req' in case of an error submitting the IO. Signed-off-by: Sam Bradshaw <sbradshaw@micron.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/nvme-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index bcbdf832b1b0..cf9b8a8a24d3 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -1053,7 +1053,7 @@ static void nvme_abort_req(struct request *req)
dev_warn(nvmeq->q_dmadev,
"Could not abort I/O %d QID %d",
req->tag, nvmeq->qid);
- blk_mq_free_request(req);
+ blk_mq_free_request(abort_req);
}
}