aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Bradshaw <sbradshaw@micron.com>2014-12-10 15:00:31 -0500
committerJens Axboe <axboe@fb.com>2014-12-10 15:00:31 -0500
commitc87fd5407e1aa1cfc6b393b03bf67010cf643dbe (patch)
tree928d7c759ee3c5d06958ad54be2cbc94d60eeac6
parent9af8785a38d4528d6675247f873b0f1ae29f3be8 (diff)
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>
-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)
1053 dev_warn(nvmeq->q_dmadev, 1053 dev_warn(nvmeq->q_dmadev,
1054 "Could not abort I/O %d QID %d", 1054 "Could not abort I/O %d QID %d",
1055 req->tag, nvmeq->qid); 1055 req->tag, nvmeq->qid);
1056 blk_mq_free_request(req); 1056 blk_mq_free_request(abort_req);
1057 } 1057 }
1058} 1058}
1059 1059