From 47a23a114b62ce5af79ac294c250172db92566d6 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew.r.wilcox@intel.com>
Date: Wed, 16 Mar 2011 16:45:49 -0400
Subject: [PATCH] --- yaml --- r: 286283 b: refs/heads/master c:
 3cb967c03926edd2c414082f4cc0feb7b372edae h: refs/heads/master i:   286281:
 beca157e8f30048f255d2c086f406022e9363789   286279:
 b060022eaa28973fd76e9b906bb200c55ce15739 v: v3

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

diff --git a/[refs] b/[refs]
index 81f2b8f8423d..f842b2d6543e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7523d834dd1573610078eb1ac0933f6490232f90
+refs/heads/master: 3cb967c03926edd2c414082f4cc0feb7b372edae
diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c
index cf89db8c41ee..8d3c0b79ac2b 100644
--- a/trunk/drivers/block/nvme.c
+++ b/trunk/drivers/block/nvme.c
@@ -1162,6 +1162,9 @@ static void nvme_resubmit_bios(struct nvme_queue *nvmeq)
 			bio_list_add_head(&nvmeq->sq_cong, bio);
 			break;
 		}
+		if (bio_list_empty(&nvmeq->sq_cong))
+			remove_wait_queue(&nvmeq->sq_full,
+							&nvmeq->sq_cong_wait);
 	}
 }