---

yaml --- r: 361679 b: refs/heads/master c: 3295874 h: refs/heads/master i: 361677: 2223534 361675: 58df6cc 361671: 1de0edc 361663: 5d919a9 v: v3
git-mirror · Nov 13, 2012 · e0f0f12 · e0f0f12
1 parent e371d4e
commit e0f0f12
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 859361a228258edf4821d9f5635825033eca78e8
+refs/heads/master: 3295874b6074d749516d6decd43afad7bf6e38ff
diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c
@@ -909,6 +909,10 @@ static void nvme_free_queue(struct nvme_dev *dev, int qid)
 
 	spin_lock_irq(&nvmeq->q_lock);
 	nvme_cancel_ios(nvmeq, false);
+	while (bio_list_peek(&nvmeq->sq_cong)) {
+		struct bio *bio = bio_list_pop(&nvmeq->sq_cong);
+		bio_endio(bio, -EIO);
+	}
 	spin_unlock_irq(&nvmeq->q_lock);
 
 	irq_set_affinity_hint(vector, NULL);