From 631f0ec11319fc51bfee77a947d5354f238eb81a Mon Sep 17 00:00:00 2001
From: Roger Pau Monne <roger.pau@citrix.com>
Date: Mon, 18 Mar 2013 17:49:32 +0100
Subject: [PATCH] --- yaml --- r: 361983 b: refs/heads/master c:
 ffb1dabd1eb10c76a1e7af62f75a1aaa8d590b5a h: refs/heads/master i:   361981:
 b8878b100d99fe477f207d65ecaeac7a2641c23c   361979:
 53a2c98a8598def67d615ad937d8f46154dd9739   361975:
 c0464d6d3086abcafa26687cb608c9cad60da4a0   361967:
 94dba142c903f0e2936b691b203a042f0b767a38   361951:
 2abce6c53abc7ac6e31b813e0664cec9edfb9274   361919:
 f62b9ec2f51d4ec5b137c28c20b09f3bd34c2f0f   361855:
 e1ed6508e1ed1cf765c4fe9a46fad5284d0d8b31   361727:
 4b196b28767f11041fded3a7df89f226bb9fd4e7   361471:
 5fc232c44baafe1aa5b2066f003b8d240eb57e20 v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/block/xen-blkback/blkback.c | 21 ++++++---------------
 trunk/drivers/block/xen-blkback/common.h  |  1 -
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 53cfc4909002..f8c5427335d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 155b7edb51430a280f86c1e21b7be308b0d219d4
+refs/heads/master: ffb1dabd1eb10c76a1e7af62f75a1aaa8d590b5a
diff --git a/trunk/drivers/block/xen-blkback/blkback.c b/trunk/drivers/block/xen-blkback/blkback.c
index 2cf8381a1c6e..dd5b2fed97e9 100644
--- a/trunk/drivers/block/xen-blkback/blkback.c
+++ b/trunk/drivers/block/xen-blkback/blkback.c
@@ -442,7 +442,7 @@ int xen_blkif_schedule(void *arg)
 }
 
 struct seg_buf {
-	unsigned long buf;
+	unsigned int offset;
 	unsigned int nsec;
 };
 /*
@@ -621,30 +621,21 @@ static int xen_blkbk_map(struct blkif_request *req,
 				 * If this is a new persistent grant
 				 * save the handler
 				 */
-				persistent_gnts[i]->handle = map[j].handle;
-				persistent_gnts[i]->dev_bus_addr =
-					map[j++].dev_bus_addr;
+				persistent_gnts[i]->handle = map[j++].handle;
 			}
 			pending_handle(pending_req, i) =
 				persistent_gnts[i]->handle;
 
 			if (ret)
 				continue;
-
-			seg[i].buf = persistent_gnts[i]->dev_bus_addr |
-				(req->u.rw.seg[i].first_sect << 9);
 		} else {
-			pending_handle(pending_req, i) = map[j].handle;
+			pending_handle(pending_req, i) = map[j++].handle;
 			bitmap_set(pending_req->unmap_seg, i, 1);
 
-			if (ret) {
-				j++;
+			if (ret)
 				continue;
-			}
-
-			seg[i].buf = map[j++].dev_bus_addr |
-				(req->u.rw.seg[i].first_sect << 9);
 		}
+		seg[i].offset = (req->u.rw.seg[i].first_sect << 9);
 	}
 	return ret;
 }
@@ -971,7 +962,7 @@ static int dispatch_rw_block_io(struct xen_blkif *blkif,
 		       (bio_add_page(bio,
 				     pages[i],
 				     seg[i].nsec << 9,
-				     seg[i].buf & ~PAGE_MASK) == 0)) {
+				     seg[i].offset) == 0)) {
 
 			bio = bio_alloc(GFP_KERNEL, nseg-i);
 			if (unlikely(bio == NULL))
diff --git a/trunk/drivers/block/xen-blkback/common.h b/trunk/drivers/block/xen-blkback/common.h
index da78346487ae..60103e2517ba 100644
--- a/trunk/drivers/block/xen-blkback/common.h
+++ b/trunk/drivers/block/xen-blkback/common.h
@@ -187,7 +187,6 @@ struct persistent_gnt {
 	struct page *page;
 	grant_ref_t gnt;
 	grant_handle_t handle;
-	uint64_t dev_bus_addr;
 	struct rb_node node;
 };