From 9cb05e2d53d577bec508be0b85ae5c478ec1eb9c Mon Sep 17 00:00:00 2001 From: Kiyoshi Ueda Date: Wed, 1 Oct 2008 10:11:20 -0400 Subject: [PATCH] --- yaml --- r: 110557 b: refs/heads/master c: 8316982ac06d7d8875dc8738efbb030791dc33bb h: refs/heads/master i: 110555: ea3df2aa4b5ef7f1e5f169cd0f654b4659b72895 v: v3 --- [refs] | 2 +- trunk/drivers/block/virtio_blk.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 615f5b1af985..2fdbc518a8b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0497b345e7d067109e0dd9bf9f4978a6847ee13b +refs/heads/master: 8316982ac06d7d8875dc8738efbb030791dc33bb diff --git a/trunk/drivers/block/virtio_blk.c b/trunk/drivers/block/virtio_blk.c index 879506a2c234..6ec5fc052786 100644 --- a/trunk/drivers/block/virtio_blk.c +++ b/trunk/drivers/block/virtio_blk.c @@ -47,20 +47,20 @@ static void blk_done(struct virtqueue *vq) spin_lock_irqsave(&vblk->lock, flags); while ((vbr = vblk->vq->vq_ops->get_buf(vblk->vq, &len)) != NULL) { - int uptodate; + int error; switch (vbr->status) { case VIRTIO_BLK_S_OK: - uptodate = 1; + error = 0; break; case VIRTIO_BLK_S_UNSUPP: - uptodate = -ENOTTY; + error = -ENOTTY; break; default: - uptodate = 0; + error = -EIO; break; } - end_dequeued_request(vbr->req, uptodate); + __blk_end_request(vbr->req, error, blk_rq_bytes(vbr->req)); list_del(&vbr->list); mempool_free(vbr, vblk->pool); }