From fdd1f4f29af18df800898a516dfed5f6c4ab2d5c Mon Sep 17 00:00:00 2001
From: Asias He <asias@redhat.com>
Date: Tue, 25 Sep 2012 10:36:17 +0800
Subject: [PATCH] --- yaml --- r: 331413 b: refs/heads/master c:
 bb8111086c12ebdadc0544ba04dccd3aad212ad2 h: refs/heads/master i:   331411:
 ea89813fdf578dca2575d6b814c13ae2ee805e9e v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/block/virtio_blk.c | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 0f3e6e90614b..c48513ade59f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d78b519f6b945aef6202bbb5b56f928572e15165
+refs/heads/master: bb8111086c12ebdadc0544ba04dccd3aad212ad2
diff --git a/trunk/drivers/block/virtio_blk.c b/trunk/drivers/block/virtio_blk.c
index 53b81d59059b..0bdde8fba397 100644
--- a/trunk/drivers/block/virtio_blk.c
+++ b/trunk/drivers/block/virtio_blk.c
@@ -274,15 +274,18 @@ static void virtblk_done(struct virtqueue *vq)
 	unsigned int len;
 
 	spin_lock_irqsave(vblk->disk->queue->queue_lock, flags);
-	while ((vbr = virtqueue_get_buf(vblk->vq, &len)) != NULL) {
-		if (vbr->bio) {
-			virtblk_bio_done(vbr);
-			bio_done = true;
-		} else {
-			virtblk_request_done(vbr);
-			req_done = true;
+	do {
+		virtqueue_disable_cb(vq);
+		while ((vbr = virtqueue_get_buf(vblk->vq, &len)) != NULL) {
+			if (vbr->bio) {
+				virtblk_bio_done(vbr);
+				bio_done = true;
+			} else {
+				virtblk_request_done(vbr);
+				req_done = true;
+			}
 		}
-	}
+	} while (!virtqueue_enable_cb(vq));
 	/* In case queue is stopped waiting for more buffers. */
 	if (req_done)
 		blk_start_queue(vblk->disk->queue);