diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2010-04-12 09:18:36 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2010-05-19 08:45:42 -0400 |
commit | 09ec6b69d2b97d6fca16cfe91b4634506f4db0a7 (patch) | |
tree | eed15ab08e6e10fcdc14510752402ffcdb0a8db3 | |
parent | 505b0451c47699ca63db70bd5ec3bba187ec4bfd (diff) |
virtio_blk: use virtqueue_xxx wrappers
Switch virtio_blk to new virtqueue_xxx wrappers.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r-- | drivers/block/virtio_blk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index e32b24b7a3a2..83fa09a836ca 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c | |||
@@ -50,7 +50,7 @@ static void blk_done(struct virtqueue *vq) | |||
50 | unsigned long flags; | 50 | unsigned long flags; |
51 | 51 | ||
52 | spin_lock_irqsave(&vblk->lock, flags); | 52 | spin_lock_irqsave(&vblk->lock, flags); |
53 | while ((vbr = vblk->vq->vq_ops->get_buf(vblk->vq, &len)) != NULL) { | 53 | while ((vbr = virtqueue_get_buf(vblk->vq, &len)) != NULL) { |
54 | int error; | 54 | int error; |
55 | 55 | ||
56 | switch (vbr->status) { | 56 | switch (vbr->status) { |
@@ -158,7 +158,7 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk, | |||
158 | } | 158 | } |
159 | } | 159 | } |
160 | 160 | ||
161 | if (vblk->vq->vq_ops->add_buf(vblk->vq, vblk->sg, out, in, vbr) < 0) { | 161 | if (virtqueue_add_buf(vblk->vq, vblk->sg, out, in, vbr) < 0) { |
162 | mempool_free(vbr, vblk->pool); | 162 | mempool_free(vbr, vblk->pool); |
163 | return false; | 163 | return false; |
164 | } | 164 | } |
@@ -187,7 +187,7 @@ static void do_virtblk_request(struct request_queue *q) | |||
187 | } | 187 | } |
188 | 188 | ||
189 | if (issued) | 189 | if (issued) |
190 | vblk->vq->vq_ops->kick(vblk->vq); | 190 | virtqueue_kick(vblk->vq); |
191 | } | 191 | } |
192 | 192 | ||
193 | static void virtblk_prepare_flush(struct request_queue *q, struct request *req) | 193 | static void virtblk_prepare_flush(struct request_queue *q, struct request *req) |