Merge branch 'for-next' of git://git.pengutronix.de/git/ukl/linux into devel-stable

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / ceph / pagevec.c

diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c
index cd9c21df87d172fa0c7bfe1af7ee289ab5dd0494..815a2249cfa9371f1f9505c7016b509b83d50100 100644 (file)
--- a/net/ceph/pagevec.c
+++ b/net/ceph/pagevec.c
@@ -12,7 +12,7 @@
 /*
  * build a vector of user pages
  */
-struct page **ceph_get_direct_page_vector(const char __user *data,
+struct page **ceph_get_direct_page_vector(const void __user *data,
                                          int num_pages, bool write_page)
 {
        struct page **pages;
@@ -93,7 +93,7 @@ EXPORT_SYMBOL(ceph_alloc_page_vector);
  * copy user data into a page vector
  */
 int ceph_copy_user_to_page_vector(struct page **pages,
-                                        const char __user *data,
+                                        const void __user *data,
                                         loff_t off, size_t len)
 {
        int i = 0;
@@ -118,17 +118,17 @@ int ceph_copy_user_to_page_vector(struct page **pages,
 }
 EXPORT_SYMBOL(ceph_copy_user_to_page_vector);
 
-int ceph_copy_to_page_vector(struct page **pages,
-                                   const char *data,
+void ceph_copy_to_page_vector(struct page **pages,
+                                   const void *data,
                                    loff_t off, size_t len)
 {
        int i = 0;
        size_t po = off & ~PAGE_CACHE_MASK;
        size_t left = len;
-       size_t l;
 
        while (left > 0) {
-               l = min_t(size_t, PAGE_CACHE_SIZE-po, left);
+               size_t l = min_t(size_t, PAGE_CACHE_SIZE-po, left);
+
                memcpy(page_address(pages[i]) + po, data, l);
                data += l;
                left -= l;
@@ -138,21 +138,20 @@ int ceph_copy_to_page_vector(struct page **pages,
                        i++;
                }
        }
-       return len;
 }
 EXPORT_SYMBOL(ceph_copy_to_page_vector);
 
-int ceph_copy_from_page_vector(struct page **pages,
-                                   char *data,
+void ceph_copy_from_page_vector(struct page **pages,
+                                   void *data,
                                    loff_t off, size_t len)
 {
        int i = 0;
        size_t po = off & ~PAGE_CACHE_MASK;
        size_t left = len;
-       size_t l;
 
        while (left > 0) {
-               l = min_t(size_t, PAGE_CACHE_SIZE-po, left);
+               size_t l = min_t(size_t, PAGE_CACHE_SIZE-po, left);
+
                memcpy(data, page_address(pages[i]) + po, l);
                data += l;
                left -= l;
@@ -162,7 +161,6 @@ int ceph_copy_from_page_vector(struct page **pages,
                        i++;
                }
        }
-       return len;
 }
 EXPORT_SYMBOL(ceph_copy_from_page_vector);
 
@@ -170,7 +168,7 @@ EXPORT_SYMBOL(ceph_copy_from_page_vector);
  * copy user data from a page vector into a user pointer
  */
 int ceph_copy_page_vector_to_user(struct page **pages,
-                                        char __user *data,
+                                        void __user *data,
                                         loff_t off, size_t len)
 {
        int i = 0;