goldish_pipe: convert to pin_user_pages() and put_user_page()

[sfrench/cifs-2.6.git] / drivers / platform / goldfish / goldfish_pipe.c

diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index ef50c264db715c1b77a3602d0dc2db7cb29ec767..2a5901efecde48ed0a449fdff326534461b368eb 100644 (file)
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -274,7 +274,7 @@ static int goldfish_pin_pages(unsigned long first_page,
                *iter_last_page_size = last_page_size;
        }
 
-       ret = get_user_pages_fast(first_page, requested_pages,
+       ret = pin_user_pages_fast(first_page, requested_pages,
                                  !is_write ? FOLL_WRITE : 0,
                                  pages);
        if (ret <= 0)
@@ -285,18 +285,6 @@ static int goldfish_pin_pages(unsigned long first_page,
        return ret;
 }
 
-static void release_user_pages(struct page **pages, int pages_count,
-                              int is_write, s32 consumed_size)
-{
-       int i;
-
-       for (i = 0; i < pages_count; i++) {
-               if (!is_write && consumed_size > 0)
-                       set_page_dirty(pages[i]);
-               put_page(pages[i]);
-       }
-}
-
 /* Populate the call parameters, merging adjacent pages together */
 static void populate_rw_params(struct page **pages,
                               int pages_count,
@@ -372,7 +360,8 @@ static int transfer_max_buffers(struct goldfish_pipe *pipe,
 
        *consumed_size = pipe->command_buffer->rw_params.consumed_size;
 
-       release_user_pages(pipe->pages, pages_count, is_write, *consumed_size);
+       put_user_pages_dirty_lock(pipe->pages, pages_count,
+                                 !is_write && *consumed_size > 0);
 
        mutex_unlock(&pipe->lock);
        return 0;