direct-io.hg

changeset 5679:b522a3a4d525

Fix blkif 'grant-table-ification'

Signed-off-by: Steven Hand <steve@xensource.com>
author smh22@firebug.cl.cam.ac.uk
date Wed Jul 06 16:50:57 2005 +0000 (2005-07-06)
parents 1883ec07708b
children 43e8e30cbea7
files linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c	Wed Jul 06 15:38:25 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c	Wed Jul 06 16:50:57 2005 +0000
     1.3 @@ -219,9 +219,7 @@ void blkif_connect(blkif_be_connect_t *c
     1.4          op.ref            = ref;
     1.5          op.dom            = domid;
     1.6         
     1.7 -        if(unlikely(HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))) {
     1.8 -            BUG();
     1.9 -        }
    1.10 +        BUG_ON( HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1) );
    1.11         
    1.12          handle = op.handle;
    1.13         
    1.14 @@ -232,10 +230,6 @@ void blkif_connect(blkif_be_connect_t *c
    1.15              return;
    1.16          }
    1.17  
    1.18 -        phys_to_machine_mapping[__pa(VMALLOC_VMADDR(vma->addr)) >>
    1.19 -                                PAGE_SHIFT] =
    1.20 -                      FOREIGN_FRAME(shmem_frame);
    1.21 -
    1.22          blkif->shmem_ref = ref;
    1.23          blkif->shmem_handle = handle;
    1.24          blkif->shmem_vaddr = VMALLOC_VMADDR(vma->addr);