Updated xen patches taken from suse.

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.25 / patches.xen / xen-blktap-write-barriers

diff --git a/src/patches/60044_xen-blktap-write-barriers.patch1 b/src/patches/suse-2.6.27.25/patches.xen/xen-blktap-write-barriers
similarity index 72%
rename from src/patches/60044_xen-blktap-write-barriers.patch1
rename to src/patches/suse-2.6.27.25/patches.xen/xen-blktap-write-barriers
index 34ed0983629f6c56ddf9d58f824179aefb9cd25a..ee72b5f0e96b8984393c4a079962da28cbad377a 100644 (file)
--- a/src/patches/60044_xen-blktap-write-barriers.patch1
+++ b/src/patches/suse-2.6.27.25/patches.xen/xen-blktap-write-barriers
@@ -2,11 +2,9 @@ From: kwolf@suse.de
 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;
  
@@ -16,7 +14,7 @@ Index: head-2008-11-10/drivers/xen/blktap/blktap.c
                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[]);
@@ -25,7 +23,7 @@ Index: head-2008-11-10/drivers/xen/blktap/blktap.c
        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;
  
@@ -47,7 +45,7 @@ Index: head-2008-11-10/drivers/xen/blktap/blktap.c
        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;
@@ -56,7 +54,7 @@ Index: head-2008-11-10/drivers/xen/blktap/blktap.c
        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;
@@ -65,7 +63,7 @@ Index: head-2008-11-10/drivers/xen/blktap/blktap.c
                        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;
@@ -74,10 +72,8 @@ Index: head-2008-11-10/drivers/xen/blktap/blktap.c
                                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;