[Xen-devel] [PATCH 12 of 12] blkback: simplify linux-2.6.18-xen.hg-918.71a61b393cdf

[Daniel Stodden <daniel.stodden@xxxxxxxxxx>]

# HG changeset patch
# User Daniel Stodden <daniel.stodden@xxxxxxxxxx>
# Date 1264726444 28800
# Node ID 4c1ba88f2fea896770d89e06497bb2695049e173
# Parent  317cdc16a674f4aa4c57b4fdae004ca5fcc24712
blkback: simplify linux-2.6.18-xen.hg-918.71a61b393cdf

Signed-off-by: Daniel Stodden <daniel.stodden@xxxxxxxxxx>

diff -r 317cdc16a674 -r 4c1ba88f2fea drivers/xen/blkback/blkback.c
--- a/drivers/xen/blkback/blkback.c     Wed Dec 16 16:44:12 2009 +0000
+++ b/drivers/xen/blkback/blkback.c     Thu Jan 28 16:54:04 2010 -0800
@@ -456,23 +456,19 @@
                        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),
-                                           pending_page(pending_req, i),
-                                           blkif->domid, req->handle,
-                                           req->seg[i].gref);
+                       continue;
                }
 
-               pending_handle(pending_req, i) = map[i].handle;
-
-               if (ret)
-                       continue;
-
                set_phys_to_machine(
                        page_to_pfn(pending_page(pending_req, i)),
                        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),
+                                   pending_page(pending_req, i),
+                                   blkif->domid, req->handle,
+                                   req->seg[i].gref);
+               pending_handle(pending_req, i) = map[i].handle;
        }
 
        if (ret)

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