---

yaml --- r: 286292 b: refs/heads/master c: 09a58f5 h: refs/heads/master v: v3
git-mirror · Nov 4, 2011 · ef7ad0b · ef7ad0b
1 parent b3a130d
commit ef7ad0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22605f96810d073eb74051d0295b6577d6a6a563
+refs/heads/master: 09a58f536436efed02ead722e835cb4ce7674afc
diff --git a/trunk/drivers/block/nvme.c b/trunk/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 {