Skip to contentSkip to conversation

NVMe: Free cmdid of nvme_submit_bio error

PATCH New Keith Busch 2 participants 2 messages Aug 2, 2012 – Nov 6, 2012

Subsystems (2)
Block layer NVMe
lore
Share & tools
lore

Keith Busch

author
#0 lore raw

PATCH 1/1 NVMe: Free cmdid of nvme_submit_bio error

Signed-off-by Keith Busch <keith.busch at intel.com>
---
 drivers/block/nvme.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
drivers/block/nvme.c +4 -1
index 3278fbd..15670ca 100644
@@ -545,6 +545,7 @@ static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns,
 	u16 control;
 	u32 dsmgmt;
 	int psegs = bio_phys_segments(ns->queue, bio);
+	nvme_completion_fn fn;
 
 	if ((bio->bi_rw & REQ_FLUSH) && psegs) {
 		result = nvme_submit_flush_data(nvmeq, ns);

@@ -588,7 +589,7 @@ static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns,
 
 	result = nvme_map_bio(nvmeq->q_dmadev, iod, bio, dma_dir, psegs);
 	if (result < 0)
-		goto free_iod;
+		goto free_cmdid;
 	length = result;
 
 	cmnd->rw.command_id = cmdid;

@@ -608,6 +609,8 @@ static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns,
 
 	return 0;
 
+ free_cmdid:
+	free_cmdid(nvmeq, cmdid, &fn);
  free_iod:
 	nvme_free_iod(nvmeq->dev, iod);
  nomem:
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 NVMe: Free cmdid of nvme_submit_bio error

Fixed it slightly differently (changed free_cmdid() to allow for fn to be NULL). But I kept your attribution and added an explanation.