1.1 --- a/docs/misc/grant-tables.txt	Wed Apr 20 17:46:27 2005 +0000
     1.2 +++ b/docs/misc/grant-tables.txt	Wed Apr 20 18:39:42 2005 +0000
     1.3 @@ -120,7 +120,7 @@ is complete.
     1.4  
     1.5          for ( i = 0; i < BATCH_SIZE; i++ )
     1.6          {
     1.7 -            if ( unlikely(aop[i].u.map_grant_ref.dev_bus_addr == 0) )
     1.8 +            if ( unlikely(aop[i].u.map_grant_ref.handle < 0) )
     1.9              {
    1.10                  tidyup_all(aop, i);
    1.11                  goto panic;

     2.1 --- a/linux-2.6.11-xen-sparse/arch/xen/Kconfig	Wed Apr 20 17:46:27 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/Kconfig	Wed Apr 20 18:39:42 2005 +0000
     2.3 @@ -62,7 +62,7 @@ config XEN_BLKDEV_TAP_BE
     2.4            modified to use grant tables.
     2.5  
     2.6  config XEN_BLKDEV_GRANT
     2.7 -        bool "Grant table substrate for block drivers (DANGEROUS)"
     2.8 +        bool "Grant table substrate for block drivers"
     2.9          depends on !XEN_BLKDEV_TAP_BE
    2.10          default y
    2.11          help

     3.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c	Wed Apr 20 17:46:27 2005 +0000
     3.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c	Wed Apr 20 18:39:42 2005 +0000
     3.3 @@ -516,11 +516,11 @@ static void dispatch_rw_block_io(blkif_t
     3.4  
     3.5      for ( i = 0; i < nseg; i++ )
     3.6      {
     3.7 +        fas         = req->frame_and_sects[i];
     3.8  #ifdef CONFIG_XEN_BLKDEV_GRANT
     3.9          seg[i].buf  = (aop[i].u.map_grant_ref.dev_bus_addr << PAGE_SHIFT) |
    3.10                        (blkif_first_sect(fas) << 9);
    3.11  #else
    3.12 -        fas          = req->frame_and_sects[i];
    3.13          seg[i].buf  = (fas & PAGE_MASK) | (blkif_first_sect(fas) << 9);
    3.14          seg[i].nsec = blkif_last_sect(fas) - blkif_first_sect(fas) + 1;
    3.15          if ( seg[i].nsec <= 0 )