From 908c7b9f788b6faed2fbfdf19920770614f8e853 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 11 Jun 2009 11:32:48 +0200 Subject: xen_disk: move sanity check to the correct place Signed-off-by: Gerd Hoffmann --- hw/xen_disk.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/xen_disk.c b/hw/xen_disk.c index f95e373124..659a839f97 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -179,10 +179,6 @@ static int ioreq_parse(struct ioreq *ioreq) switch (ioreq->req.operation) { case BLKIF_OP_READ: ioreq->prot = PROT_WRITE; /* to memory */ - if (ioreq->req.operation != BLKIF_OP_READ && blkdev->mode[0] != 'w') { - xen_be_printf(&blkdev->xendev, 0, "error: write req for ro device\n"); - goto err; - } break; case BLKIF_OP_WRITE_BARRIER: if (!syncwrite) @@ -199,6 +195,11 @@ static int ioreq_parse(struct ioreq *ioreq) goto err; }; + if (ioreq->req.operation != BLKIF_OP_READ && blkdev->mode[0] != 'w') { + xen_be_printf(&blkdev->xendev, 0, "error: write req for ro device\n"); + goto err; + } + ioreq->start = ioreq->req.sector_number * blkdev->file_blk; for (i = 0; i < ioreq->req.nr_segments; i++) { if (i == BLKIF_MAX_SEGMENTS_PER_REQUEST) { -- cgit v1.2.3