Commit ee1eb8cc authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Ilya Dryomov
Browse files

libceph: Remove unused pagevec functions 



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

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

Remove them.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 03854920

include/linux/ceph/libceph.h

+0 −6
Original line number Diff line number Diff line
@@ -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);

net/ceph/pagevec.c

+0 −52
Original line number Diff line number Diff line
@@ -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)