From 36c0df6ba46bfa18b21ee1090d6d078bc4ab1da6 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 20 Jul 2009 10:03:44 +0100 Subject: [PATCH] blkback: pagemap bug fixes Signed-off-by: Jake Wires --- drivers/xen/blkback/blkback.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/xen/blkback/blkback.c b/drivers/xen/blkback/blkback.c index a7729088..78311e32 100644 --- a/drivers/xen/blkback/blkback.c +++ b/drivers/xen/blkback/blkback.c @@ -453,6 +453,11 @@ static void dispatch_rw_block_io(blkif_t *blkif, DPRINTK("invalid buffer -- could not remap it\n"); map[i].handle = BLKBACK_INVALID_HANDLE; ret |= 1; + } else { + blkback_pagemap_set(vaddr_pagenr(pending_req, i), + virt_to_page(vaddr(pending_req, i)), + blkif->domid, req->handle, + req->seg[i].gref); } pending_handle(pending_req, i) = map[i].handle; @@ -465,10 +470,6 @@ static void dispatch_rw_block_io(blkif_t *blkif, FOREIGN_FRAME(map[i].dev_bus_addr >> PAGE_SHIFT)); seg[i].buf = map[i].dev_bus_addr | (req->seg[i].first_sect << 9); - blkback_pagemap_set(vaddr_pagenr(pending_req, i), - virt_to_page(vaddr(pending_req, i)), - blkif->domid, req->handle, - req->seg[i].gref); } if (ret) -- 2.39.5