From: Keith Busch <keith.busch@intel.com>
Date: Thu, 8 Aug 2013 16:25:38 +0000 (-0600)
Subject: NVMe: Disk stats for read/write commands only
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=9e59d091b0eb04f223ed037348e3d9e36f30e72b;p=deliverable%2Flinux.git

NVMe: Disk stats for read/write commands only

Flush and discard requests would previously mess up the accounting.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
---

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 8cfa4576d424..360ac5d32d26 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -342,11 +342,11 @@ 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)
+	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_end_io_acct(bio, iod->start_time);
+		nvme_end_io_acct(bio, iod->start_time);
+	}
 	nvme_free_iod(dev, iod);
 	if (status)
 		bio_endio(bio, -EIO);