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

Commit 2b196034 authored by Keith Busch's avatar Keith Busch Committed by Matthew Wilcox
Browse files

NVMe: Initialize iod nents to 0 



For commands that do not map a scatter list, we need to initilaize the iod's
number of sg entries (nents) to 0 and not unmap in this case.

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

drivers/block/nvme.c

+3 −1
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ nvme_alloc_iod(unsigned nseg, unsigned nbytes, gfp_t gfp) 
		iod->offset = offsetof(struct nvme_iod, sg[nseg]);

		iod->npages = -1;

		iod->length = nbytes;

		iod->nents = 0;

	}



	return iod;
@@ -377,6 +378,7 @@ static void bio_completion(struct nvme_dev *dev, void *ctx, 
	struct bio *bio = iod->private;

	u16 status = le16_to_cpup(&cqe->status) >> 1;



	if (iod->nents)

		dma_unmap_sg(&dev->pci_dev->dev, iod->sg, iod->nents,

			bio_data_dir(bio) ? DMA_TO_DEVICE : DMA_FROM_DEVICE);

	nvme_free_iod(dev, iod);