# HG changeset patch
# User Daniel Stodden <daniel.stodden@xxxxxxxxxx>
# Date 1265397144 28800
# Node ID 7d0b5bd0725f0c28105e6729c0b907caf8358c94
# Parent  7cf2b4299ec1c6ed632ae596368d4c39f28f0479
blkback: simplify linux-2.6.18-xen.hg-918.71a61b393cdf

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

diff -r 7cf2b4299ec1 -r 7d0b5bd0725f 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	Fri Feb 05 11:12:24 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)