libceph: Remove unused pagevec functions

ceph_copy_user_to_page_vector() has been unused since 2013's commit
e8344e668915 ("ceph: Implement writev/pwritev for sync operation.")

ceph_copy_to_page_vector() has been unused since 2012's commit
913d2fdcf605 ("rbd: always pass ops array to rbd_req_sync_op()")

Remove them.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
index 15fb566d3f46ab021a99d56edf1693ea616ef9e6..733e7f93db66a7a29a4a8eba97e9ebf2c49da1f9 100644 (file)
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
@@ -317,12 +317,6 @@ extern void ceph_release_page_vector(struct page **pages, int num_pages);
 extern void ceph_put_page_vector(struct page **pages, int num_pages,
                                 bool dirty);
 extern struct page **ceph_alloc_page_vector(int num_pages, gfp_t flags);
-extern int ceph_copy_user_to_page_vector(struct page **pages,
-                                        const void __user *data,
-                                        loff_t off, size_t len);
-extern void ceph_copy_to_page_vector(struct page **pages,
-                                   const void *data,
-                                   loff_t off, size_t len);
 extern void ceph_copy_from_page_vector(struct page **pages,
                                    void *data,
                                    loff_t off, size_t len);

diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c
index 64305e7056a1c738ef178d59544822af8ce49ea4..4509757d8b3be6ff49554d4110a25fc4ad991ad6 100644 (file)
--- a/net/ceph/pagevec.c
+++ b/net/ceph/pagevec.c
@@ -55,58 +55,6 @@ struct page **ceph_alloc_page_vector(int num_pages, gfp_t flags)
 }
 EXPORT_SYMBOL(ceph_alloc_page_vector);
 
-/*
- * copy user data into a page vector
- */
-int ceph_copy_user_to_page_vector(struct page **pages,
-                                        const void __user *data,
-                                        loff_t off, size_t len)
-{
-       int i = 0;
-       int po = off & ~PAGE_MASK;
-       int left = len;
-       int l, bad;
-
-       while (left > 0) {
-               l = min_t(int, PAGE_SIZE-po, left);
-               bad = copy_from_user(page_address(pages[i]) + po, data, l);
-               if (bad == l)
-                       return -EFAULT;
-               data += l - bad;
-               left -= l - bad;
-               po += l - bad;
-               if (po == PAGE_SIZE) {
-                       po = 0;
-                       i++;
-               }
-       }
-       return len;
-}
-EXPORT_SYMBOL(ceph_copy_user_to_page_vector);
-
-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_MASK;
-       size_t left = len;
-
-       while (left > 0) {
-               size_t l = min_t(size_t, PAGE_SIZE-po, left);
-
-               memcpy(page_address(pages[i]) + po, data, l);
-               data += l;
-               left -= l;
-               po += l;
-               if (po == PAGE_SIZE) {
-                       po = 0;
-                       i++;
-               }
-       }
-}
-EXPORT_SYMBOL(ceph_copy_to_page_vector);
-
 void ceph_copy_from_page_vector(struct page **pages,
                                    void *data,
                                    loff_t off, size_t len)