Merge branch 'work.get_user_pages_fast' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / net / ceph / pagevec.c

diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c
index ee43bc13221c5d7dffcfed609dfffb48107736f4..a3d0adc828e6417e7772420fddbdff1313064f65 100644 (file)
--- a/net/ceph/pagevec.c
+++ b/net/ceph/pagevec.c
@@ -25,9 +25,9 @@ struct page **ceph_get_direct_page_vector(const void __user *data,
                return ERR_PTR(-ENOMEM);
 
        while (got < num_pages) {
-               rc = get_user_pages_unlocked(
+               rc = get_user_pages_fast(
                    (unsigned long)data + ((unsigned long)got * PAGE_SIZE),
-                   num_pages - got, pages + got, write_page ? FOLL_WRITE : 0);
+                   num_pages - got, write_page, pages + got);
                if (rc < 0)
                        break;
                BUG_ON(rc == 0);