Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 859361a2 authored by Keith Busch's avatar Keith Busch Committed by Matthew Wilcox
Browse files

NVMe: Free cmdid on nvme_submit_bio error 



nvme_map_bio() is called after the cmdid is allocated, so we have to
free the cmdid before returning from nvme_submit_bio() if nvme_map_bio()
returned an error.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
parent 9924a199

drivers/block/nvme.c

+5 −2
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ static void *free_cmdid(struct nvme_queue *nvmeq, int cmdid, 
		*fn = special_completion;

		return CMD_CTX_INVALID;

	}

	if (fn)

		*fn = info[cmdid].fn;

	ctx = info[cmdid].ctx;

	info[cmdid].fn = special_completion;
@@ -589,7 +590,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;
@@ -609,6 +610,8 @@ static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns, 


	return 0;



 free_cmdid:

	free_cmdid(nvmeq, cmdid, NULL);

 free_iod:

	nvme_free_iod(nvmeq->dev, iod);

 nomem: