[Xen-changelog] grant-tables.txt:

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1344, 2005/04/20 19:39:42+01:00, cwc22@xxxxxxxxxxxxxxxxxxxxxx

        grant-tables.txt:
          fix to error check condition after map
        blkback.c:
          bug fix to grant table code in block backend
        Kconfig:
          amend config entry for XEN_BLKDEV_GRANT



 docs/misc/grant-tables.txt                            |    2 +-
 linux-2.6.11-xen-sparse/arch/xen/Kconfig              |    2 +-
 linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


diff -Nru a/docs/misc/grant-tables.txt b/docs/misc/grant-tables.txt
--- a/docs/misc/grant-tables.txt        2005-04-20 17:02:33 -04:00
+++ b/docs/misc/grant-tables.txt        2005-04-20 17:02:33 -04:00
@@ -120,7 +120,7 @@
 
         for ( i = 0; i < BATCH_SIZE; i++ )
         {
-            if ( unlikely(aop[i].u.map_grant_ref.dev_bus_addr == 0) )
+            if ( unlikely(aop[i].u.map_grant_ref.handle < 0) )
             {
                 tidyup_all(aop, i);
                 goto panic;
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/Kconfig 
b/linux-2.6.11-xen-sparse/arch/xen/Kconfig
--- a/linux-2.6.11-xen-sparse/arch/xen/Kconfig  2005-04-20 17:02:33 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/Kconfig  2005-04-20 17:02:33 -04:00
@@ -62,7 +62,7 @@
           modified to use grant tables.
 
 config XEN_BLKDEV_GRANT
-        bool "Grant table substrate for block drivers (DANGEROUS)"
+        bool "Grant table substrate for block drivers"
         depends on !XEN_BLKDEV_TAP_BE
         default y
         help
diff -Nru a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c 
b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c     2005-04-20 
17:02:33 -04:00
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c     2005-04-20 
17:02:33 -04:00
@@ -516,11 +516,11 @@
 
     for ( i = 0; i < nseg; i++ )
     {
+        fas         = req->frame_and_sects[i];
 #ifdef CONFIG_XEN_BLKDEV_GRANT
         seg[i].buf  = (aop[i].u.map_grant_ref.dev_bus_addr << PAGE_SHIFT) |
                       (blkif_first_sect(fas) << 9);
 #else
-        fas          = req->frame_and_sects[i];
         seg[i].buf  = (fas & PAGE_MASK) | (blkif_first_sect(fas) << 9);
         seg[i].nsec = blkif_last_sect(fas) - blkif_first_sect(fas) + 1;
         if ( seg[i].nsec <= 0 )

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