Merge branch 'akpm' (patches from Andrew)

[platform/kernel/linux-rpi.git] / drivers / xen / privcmd.c

diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index 5dfc59f..63abe6c 100644 (file)
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -579,13 +579,13 @@ out_unlock:
 
 static int lock_pages(
        struct privcmd_dm_op_buf kbufs[], unsigned int num,
-       struct page *pages[], unsigned int nr_pages)
+       struct page *pages[], unsigned int nr_pages, unsigned int *pinned)
 {
        unsigned int i;
 
        for (i = 0; i < num; i++) {
                unsigned int requested;
-               int pinned;
+               int page_count;
 
                requested = DIV_ROUND_UP(
                        offset_in_page(kbufs[i].uptr) + kbufs[i].size,
@@ -593,14 +593,15 @@ static int lock_pages(
                if (requested > nr_pages)
                        return -ENOSPC;
 
-               pinned = get_user_pages_fast(
+               page_count = pin_user_pages_fast(
                        (unsigned long) kbufs[i].uptr,
                        requested, FOLL_WRITE, pages);
-               if (pinned < 0)
-                       return pinned;
+               if (page_count < 0)
+                       return page_count;
 
-               nr_pages -= pinned;
-               pages += pinned;
+               *pinned += page_count;
+               nr_pages -= page_count;
+               pages += page_count;
        }
 
        return 0;
@@ -608,15 +609,7 @@ static int lock_pages(
 
 static void unlock_pages(struct page *pages[], unsigned int nr_pages)
 {
-       unsigned int i;
-
-       if (!pages)
-               return;
-
-       for (i = 0; i < nr_pages; i++) {
-               if (pages[i])
-                       put_page(pages[i]);
-       }
+       unpin_user_pages_dirty_lock(pages, nr_pages, true);
 }
 
 static long privcmd_ioctl_dm_op(struct file *file, void __user *udata)
@@ -629,6 +622,7 @@ static long privcmd_ioctl_dm_op(struct file *file, void __user *udata)
        struct xen_dm_op_buf *xbufs = NULL;
        unsigned int i;
        long rc;
+       unsigned int pinned = 0;
 
        if (copy_from_user(&kdata, udata, sizeof(kdata)))
                return -EFAULT;
@@ -682,9 +676,11 @@ static long privcmd_ioctl_dm_op(struct file *file, void __user *udata)
                goto out;
        }
 
-       rc = lock_pages(kbufs, kdata.num, pages, nr_pages);
-       if (rc)
+       rc = lock_pages(kbufs, kdata.num, pages, nr_pages, &pinned);
+       if (rc < 0) {
+               nr_pages = pinned;
                goto out;
+       }
 
        for (i = 0; i < kdata.num; i++) {
                set_xen_guest_handle(xbufs[i].h, kbufs[i].uptr);