blktap: Indirection in vm_area_struct->vm_private_data

The recent patch in linux-2.6.18.hg (878: eba6fe6d8d53) changed the
way that the foreign map is stored in vm_area_struct. Currently blktap
(not 2) implementation is internally inconsistent, which triggers
kernel bug when tap:aio disk is used (dump attached at the end of the
email).

Signed-off-by: Grzegorz Milos <gm281@cam.ac.uk>

diff --git a/drivers/xen/blktap/blktap.c b/drivers/xen/blktap/blktap.c
index 987e785728506fe0c8f201b7c87715bc873290bf..5f5378dbf6515779822c9483fd5d3c5a3713aca5 100644 (file)
--- a/drivers/xen/blktap/blktap.c
+++ b/drivers/xen/blktap/blktap.c
@@ -733,7 +733,7 @@ static int blktap_mmap(struct file *filp, struct vm_area_struct *vma)
                goto fail;
        }
 
-       vma->vm_private_data = info->foreign_map.map;
+       vma->vm_private_data = &info->foreign_map;
        vma->vm_flags |= VM_FOREIGN;
        vma->vm_flags |= VM_DONTCOPY;