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

Commit 1287dabd authored by Wei Yongjun's avatar Wei Yongjun Committed by Matthew Wilcox
Browse files

NVMe: fix error return code in nvme_submit_bio_queue() 



nvme_submit_flush_data() might overwrite the initialisation of the
return value with 0, so move the -ENOMEM setting close to the usage.

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
parent 5460fc03

drivers/block/nvme-core.c

+2 −1
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns, 
	struct nvme_command *cmnd;

	struct nvme_iod *iod;

	enum dma_data_direction dma_dir;

	int cmdid, length, result = -ENOMEM;

	int cmdid, length, result;

	u16 control;

	u32 dsmgmt;

	int psegs = bio_phys_segments(ns->queue, bio);
@@ -640,6 +640,7 @@ static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns, 
			return result;

	}



	result = -ENOMEM;

	iod = nvme_alloc_iod(psegs, bio->bi_size, GFP_ATOMIC);

	if (!iod)

		goto nomem;