From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 20 Jul 2009 09:03:44 +0000 (+0100)
Subject: blkback: pagemap bug fixes
X-Git-Tag: xen-3.4.2~23
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=36c0df6ba46bfa18b21ee1090d6d078bc4ab1da6;p=legacy%2Flinux-2.6.18-xen.git

blkback: pagemap bug fixes

Signed-off-by: Jake Wires <jake.wires@citrix.com>
---

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)