xen: use vma_pages().

Replace explicit computation of vma page count by a call to
vma_pages().

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
(cherry picked from commit c7ebf9d9c6b4e9402b978da0b0785db4129c1f79)
Signed-off-by: Bob Liu <bob.liu@oracle.com>
Orabug: 24820937

diff --git a/drivers/xen/gntalloc.c b/drivers/xen/gntalloc.c
index 14370df9ac1cc17eeb554f16176fa5c5288d5338..63b2895dd3bc7a40f098788bec144aa413f2fb98 100644 (file)
--- a/drivers/xen/gntalloc.c
+++ b/drivers/xen/gntalloc.c
@@ -504,7 +504,7 @@ static int gntalloc_mmap(struct file *filp, struct vm_area_struct *vma)
        struct gntalloc_file_private_data *priv = filp->private_data;
        struct gntalloc_vma_private_data *vm_priv;
        struct gntalloc_gref *gref;
-       int count = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+       int count = vma_pages(vma);
        int rv, i;
 
        if (!(vma->vm_flags & VM_SHARED)) {

diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 581d350a78cb09733a2ad382663e2840a188aaa4..b6dd5ad834e3a268b6175698f61a620cedc97b13 100644 (file)
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -982,7 +982,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
 {
        struct gntdev_priv *priv = flip->private_data;
        int index = vma->vm_pgoff;
-       int count = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+       int count = vma_pages(vma);
        struct grant_map *map;
        int i, err = -EINVAL;
 

diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index 5bc791ac4242afd5f32f00a2fda333c03ab7b1f8..014ce0bbbeca98b8df8e938cdbedb520dfbad163 100644 (file)
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -582,7 +582,7 @@ static long privcmd_ioctl(struct file *file,
 static void privcmd_close(struct vm_area_struct *vma)
 {
        struct page **pages = vma->vm_private_data;
-       int numpgs = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+       int numpgs = vma_pages(vma);
        int numgfns = (vma->vm_end - vma->vm_start) >> XEN_PAGE_SHIFT;
        int rc;