[Xen-changelog] [linux-2.6.18-xen] blkback: pagemap bug fixes

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1248080624 -3600
# Node ID 71a61b393cdf313c15b077f6128e9e3f5b9b680c
# Parent  b420e936c022dd90eaf0b4c0e063fe829659f56c
blkback: pagemap bug fixes

Signed-off-by: Jake Wires <jake.wires@xxxxxxxxxx>
---
 drivers/xen/blkback/blkback.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff -r b420e936c022 -r 71a61b393cdf drivers/xen/blkback/blkback.c
--- a/drivers/xen/blkback/blkback.c     Wed Jul 15 09:10:37 2009 +0100
+++ b/drivers/xen/blkback/blkback.c     Mon Jul 20 10:03:44 2009 +0100
@@ -453,6 +453,11 @@ static void dispatch_rw_block_io(blkif_t
                        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
                        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)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog