rds: convert get_user_pages() --> pin_user_pages()

[linux-2.6-microblaze.git] / net / rds / info.c

diff --git a/net/rds/info.c b/net/rds/info.c
index 03f6fd5..e1d6356 100644 (file)
--- a/net/rds/info.c
+++ b/net/rds/info.c
@@ -162,7 +162,6 @@ int rds_info_getsockopt(struct socket *sock, int optname, char __user *optval,
        struct rds_info_lengths lens;
        unsigned long nr_pages = 0;
        unsigned long start;
-       unsigned long i;
        rds_info_func func;
        struct page **pages = NULL;
        int ret;
@@ -193,7 +192,7 @@ int rds_info_getsockopt(struct socket *sock, int optname, char __user *optval,
                ret = -ENOMEM;
                goto out;
        }
-       ret = get_user_pages_fast(start, nr_pages, FOLL_WRITE, pages);
+       ret = pin_user_pages_fast(start, nr_pages, FOLL_WRITE, pages);
        if (ret != nr_pages) {
                if (ret > 0)
                        nr_pages = ret;
@@ -235,8 +234,7 @@ call_func:
                ret = -EFAULT;
 
 out:
-       for (i = 0; pages && i < nr_pages; i++)
-               put_page(pages[i]);
+       unpin_user_pages(pages, nr_pages);
        kfree(pages);
 
        return ret;