From: Matthew Wilcox <matthew.r.wilcox@intel.com>
Date: Fri, 29 Apr 2011 06:09:09 +0000 (-0700)
Subject: NVMe: Fix bug in error handling
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~15687^2~31
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=09a58f536436efed02ead722e835cb4ce7674afc;p=mirror_ubuntu-artful-kernel.git

NVMe: Fix bug in error handling

When an I/O completed with an error, we would call bio_endio twice
(once with -EIO and once with 0).  Found by inspection.

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

diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index 57f2b33a47dd..205405e7f6b0 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -310,9 +310,9 @@ static void bio_completion(struct nvme_queue *nvmeq, void *ctx,
 	dma_unmap_sg(nvmeq->q_dmadev, nbio->sg, nbio->nents,
 			bio_data_dir(bio) ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
 	free_nbio(nvmeq, nbio);
-	if (status)
+	if (status) {
 		bio_endio(bio, -EIO);
-	if (bio->bi_vcnt > bio->bi_idx) {
+	} else if (bio->bi_vcnt > bio->bi_idx) {
 		bio_list_add(&nvmeq->sq_cong, bio);
 		wake_up_process(nvme_thread);
 	} else {