From 253131d33f1f3744def39fc060c9c3566bac290c Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Mon, 12 Apr 2010 16:18:36 +0300
Subject: [PATCH] --- yaml --- r: 197855 b: refs/heads/master c:
 09ec6b69d2b97d6fca16cfe91b4634506f4db0a7 h: refs/heads/master i:   197853:
 9d063ccbe83ba08cf58c12981205e7310ee393f8   197851:
 8c5b5af53ddcf351d52602ab39c0d6ed27b89c5c   197847:
 ffa79416fa0f617a9c9844f33d3a8ec50df97965   197839:
 6b76f1211725b9287ec256fc894dbd957ff393aa   197823:
 8dd322c581b9c8883dad94500b4077db63d0d8f1 v: v3

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

diff --git a/[refs] b/[refs]
index 399578a5ebef..d3714c1dcfdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 505b0451c47699ca63db70bd5ec3bba187ec4bfd
+refs/heads/master: 09ec6b69d2b97d6fca16cfe91b4634506f4db0a7
diff --git a/trunk/drivers/block/virtio_blk.c b/trunk/drivers/block/virtio_blk.c
index e32b24b7a3a2..83fa09a836ca 100644
--- a/trunk/drivers/block/virtio_blk.c
+++ b/trunk/drivers/block/virtio_blk.c
@@ -50,7 +50,7 @@ static void blk_done(struct virtqueue *vq)
 	unsigned long flags;
 
 	spin_lock_irqsave(&vblk->lock, flags);
-	while ((vbr = vblk->vq->vq_ops->get_buf(vblk->vq, &len)) != NULL) {
+	while ((vbr = virtqueue_get_buf(vblk->vq, &len)) != NULL) {
 		int error;
 
 		switch (vbr->status) {
@@ -158,7 +158,7 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk,
 		}
 	}
 
-	if (vblk->vq->vq_ops->add_buf(vblk->vq, vblk->sg, out, in, vbr) < 0) {
+	if (virtqueue_add_buf(vblk->vq, vblk->sg, out, in, vbr) < 0) {
 		mempool_free(vbr, vblk->pool);
 		return false;
 	}
@@ -187,7 +187,7 @@ static void do_virtblk_request(struct request_queue *q)
 	}
 
 	if (issued)
-		vblk->vq->vq_ops->kick(vblk->vq);
+		virtqueue_kick(vblk->vq);
 }
 
 static void virtblk_prepare_flush(struct request_queue *q, struct request *req)