From e0f0f1274efd77ffae27d09ba010a96280e93f51 Mon Sep 17 00:00:00 2001
From: Keith Busch <keith.busch@intel.com>
Date: Mon, 20 Aug 2012 14:57:49 -0600
Subject: [PATCH] --- yaml --- r: 361679 b: refs/heads/master c:
 3295874b6074d749516d6decd43afad7bf6e38ff h: refs/heads/master i:   361677:
 222353410954b30d399ce5cf6c46649bb89a81b2   361675:
 58df6cc07e520861b2aa742f69cfd4663030e87b   361671:
 1de0edc1e6cb1d8ec2212f10af7395fa2b15e995   361663:
 5d919a9189ceb74f325d9c8627eeb7c428428aab v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/block/nvme.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ee5445a5fe63..31d6eb7471d2 100644
--- 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
index 954a61018dc2..af88635e44e4 100644
--- 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);