[Xen-changelog] Fix blkif 'grant-table-ification'

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User smh22@xxxxxxxxxxxxxxxxxxxx
# Node ID b522a3a4d525b1b5ead7617915a6fec23fd07dba
# Parent  1883ec07708b5ce77c1daa1d7a5e15f7ba0feac8

Fix blkif 'grant-table-ification' 

Signed-off-by: Steven Hand <steve@xxxxxxxxxxxxx>

diff -r 1883ec07708b -r b522a3a4d525 
linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c   Wed Jul  6 
15:38:25 2005
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c   Wed Jul  6 
16:50:57 2005
@@ -219,9 +219,7 @@
         op.ref            = ref;
         op.dom            = domid;
        
-        if(unlikely(HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 
1))) {
-            BUG();
-        }
+        BUG_ON( HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1) );
        
         handle = op.handle;
        
@@ -231,10 +229,6 @@
             vfree(vma->addr);
             return;
         }
-
-        phys_to_machine_mapping[__pa(VMALLOC_VMADDR(vma->addr)) >>
-                                PAGE_SHIFT] =
-                      FOREIGN_FRAME(shmem_frame);
 
         blkif->shmem_ref = ref;
         blkif->shmem_handle = handle;

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