aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/nvme-core.c
diff options
context:
space:
mode:
authorKeith Busch <keith.busch@intel.com>2013-08-08 10:25:38 -0600
committerMatthew Wilcox <matthew.r.wilcox@intel.com>2013-09-03 16:33:35 -0400
commit9e59d091b0eb04f223ed037348e3d9e36f30e72b (patch)
tree0c3684483462fa82ddafe20eaf34bcc65d13fca1 /drivers/block/nvme-core.c
parentNVMe: Bring up cdev on set feature failure (diff)
downloadlinux-dev-9e59d091b0eb04f223ed037348e3d9e36f30e72b.tar.xz
linux-dev-9e59d091b0eb04f223ed037348e3d9e36f30e72b.zip
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>
Diffstat (limited to 'drivers/block/nvme-core.c')
-rw-r--r--drivers/block/nvme-core.c6
1 files changed, 3 insertions, 3 deletions
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);