[Xen-devel] [PATCH 09 of 12] blkback: pagemap bug fixes

[Daniel Stodden <daniel.stodden@xxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1248080624 -3600
# Node ID 72b77ff2d5229f9dc14bbaff6fcdec943da59415
# Parent  40d2f5a659a72a1d305a9501f5e6afbe78f62d83
blkback: pagemap bug fixes

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

diff -r 40d2f5a659a7 -r 72b77ff2d522 drivers/xen/blkback/blkback.c
--- a/drivers/xen/blkback/blkback.c     Mon Jun 29 10:57:46 2009 +0100
+++ b/drivers/xen/blkback/blkback.c     Mon Jul 20 10:03:44 2009 +0100
@@ -454,6 +454,11 @@
                        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;
@@ -466,10 +471,6 @@
                        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-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel