mm, tree-wide: rename put_user_page*() to unpin_user_page*()

[linux-2.6-block.git] / drivers / vfio / vfio_iommu_type1.c

diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 2ada8e6cdb88967750adad2badbc14248bed6052..a177bf2c668345081cc1cb6cb0dd2d67e5b53443 100644 (file)
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -309,9 +309,8 @@ static int put_pfn(unsigned long pfn, int prot)
 {
        if (!is_invalid_reserved_pfn(pfn)) {
                struct page *page = pfn_to_page(pfn);
-               if (prot & IOMMU_WRITE)
-                       SetPageDirty(page);
-               put_page(page);
+
+               unpin_user_pages_dirty_lock(&page, 1, prot & IOMMU_WRITE);
                return 1;
        }
        return 0;
@@ -322,7 +321,6 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,
 {
        struct page *page[1];
        struct vm_area_struct *vma;
-       struct vm_area_struct *vmas[1];
        unsigned int flags = 0;
        int ret;
 
@@ -330,33 +328,14 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,
                flags |= FOLL_WRITE;
 
        down_read(&mm->mmap_sem);
-       if (mm == current->mm) {
-               ret = get_user_pages(vaddr, 1, flags | FOLL_LONGTERM, page,
-                                    vmas);
-       } else {
-               ret = get_user_pages_remote(NULL, mm, vaddr, 1, flags, page,
-                                           vmas, NULL);
-               /*
-                * The lifetime of a vaddr_get_pfn() page pin is
-                * userspace-controlled. In the fs-dax case this could
-                * lead to indefinite stalls in filesystem operations.
-                * Disallow attempts to pin fs-dax pages via this
-                * interface.
-                */
-               if (ret > 0 && vma_is_fsdax(vmas[0])) {
-                       ret = -EOPNOTSUPP;
-                       put_page(page[0]);
-               }
-       }
-       up_read(&mm->mmap_sem);
-
+       ret = pin_user_pages_remote(NULL, mm, vaddr, 1, flags | FOLL_LONGTERM,
+                                   page, NULL, NULL);
        if (ret == 1) {
                *pfn = page_to_pfn(page[0]);
-               return 0;
+               ret = 0;
+               goto done;
        }
 
-       down_read(&mm->mmap_sem);
-
        vaddr = untagged_addr(vaddr);
 
        vma = find_vma_intersection(mm, vaddr, vaddr + 1);
@@ -366,7 +345,7 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,
                if (is_invalid_reserved_pfn(*pfn))
                        ret = 0;
        }
-
+done:
        up_read(&mm->mmap_sem);
        return ret;
 }