Subject: blktap: Write Barriers
Patch-mainline: obsolete
-Index: head-2008-11-10/drivers/xen/blktap/blktap.c
-===================================================================
---- head-2008-11-10.orig/drivers/xen/blktap/blktap.c 2008-11-10 12:10:23.000000000 +0100
-+++ head-2008-11-10/drivers/xen/blktap/blktap.c 2008-11-10 12:14:32.000000000 +0100
-@@ -1324,6 +1324,9 @@ static int do_block_io_op(blkif_t *blkif
+--- sle11-2009-04-20.orig/drivers/xen/blktap/blktap.c 2009-04-20 11:40:25.000000000 +0200
++++ sle11-2009-04-20/drivers/xen/blktap/blktap.c 2009-04-20 11:41:45.000000000 +0200
+@@ -1321,6 +1321,9 @@ static int do_block_io_op(blkif_t *blkif
dispatch_rw_block_io(blkif, &req, pending_req);
break;
case BLKIF_OP_WRITE:
blkif->st_wr_req++;
dispatch_rw_block_io(blkif, &req, pending_req);
-@@ -1355,7 +1358,7 @@ static void dispatch_rw_block_io(blkif_t
+@@ -1352,7 +1355,7 @@ static void dispatch_rw_block_io(blkif_t
pending_req_t *pending_req)
{
extern void ll_rw_block(int rw, int nr, struct buffer_head * bhs[]);
struct gnttab_map_grant_ref map[BLKIF_MAX_SEGMENTS_PER_REQUEST*2];
unsigned int nseg;
int ret, i, nr_sects = 0;
-@@ -1366,6 +1369,21 @@ static void dispatch_rw_block_io(blkif_t
+@@ -1364,6 +1367,21 @@ static void dispatch_rw_block_io(blkif_t
uint16_t mmap_idx = pending_req->mem_idx;
struct mm_struct *mm;
if (blkif->dev_num < 0 || blkif->dev_num > MAX_TAP_DEV)
goto fail_response;
-@@ -1404,7 +1422,7 @@ static void dispatch_rw_block_io(blkif_t
+@@ -1402,7 +1420,7 @@ static void dispatch_rw_block_io(blkif_t
pending_req->blkif = blkif;
pending_req->id = req->id;
pending_req->status = BLKIF_RSP_OKAY;
pending_req->nr_pages = nseg;
op = 0;
-@@ -1421,7 +1439,7 @@ static void dispatch_rw_block_io(blkif_t
+@@ -1420,7 +1438,7 @@ static void dispatch_rw_block_io(blkif_t
kvaddr = idx_to_kaddr(mmap_idx, pending_idx, i);
flags = GNTMAP_host_map;
flags |= GNTMAP_readonly;
gnttab_set_map_op(&map[op], kvaddr, flags,
req->seg[i].gref, blkif->domid);
-@@ -1438,7 +1456,7 @@ static void dispatch_rw_block_io(blkif_t
+@@ -1437,7 +1455,7 @@ static void dispatch_rw_block_io(blkif_t
flags = GNTMAP_host_map | GNTMAP_application_map
| GNTMAP_contains_pte;
flags |= GNTMAP_readonly;
gnttab_set_map_op(&map[op], ptep, flags,
req->seg[i].gref, blkif->domid);
-Index: head-2008-11-10/drivers/xen/blktap/xenbus.c
-===================================================================
---- head-2008-11-10.orig/drivers/xen/blktap/xenbus.c 2008-11-10 12:14:29.000000000 +0100
-+++ head-2008-11-10/drivers/xen/blktap/xenbus.c 2008-11-10 12:14:32.000000000 +0100
+--- sle11-2009-04-20.orig/drivers/xen/blktap/xenbus.c 2008-09-15 15:10:39.000000000 +0200
++++ sle11-2009-04-20/drivers/xen/blktap/xenbus.c 2008-11-10 12:14:32.000000000 +0100
@@ -395,7 +395,28 @@ static void connect(struct backend_info
int err;