aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-02-06 14:11:38 -0500
committerAlex Elder <elder@inktank.com>2013-02-19 20:14:04 -0500
commitb324814e8436772cb3367b14149ba003a9954525 (patch)
tree37ab98802744072a3e348623f1c880ae11546203 /net
parent9e0eb85d5861d512759caf1301670b36d4c221ed (diff)
libceph: use void pointers in page vector functions
The functions used for working with ceph page vectors are defined with char pointers, but they're really intended to operate on untyped data. Change the types of these function parameters to (void *) to reflect this. (Note that the functions now assume void pointer arithmetic works like arithmetic on char pointers.) Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'net')
-rw-r--r--net/ceph/pagevec.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c
index cd9c21df87d1..5b20be979c19 100644
--- a/net/ceph/pagevec.c
+++ b/net/ceph/pagevec.c
@@ -12,7 +12,7 @@
12/* 12/*
13 * build a vector of user pages 13 * build a vector of user pages
14 */ 14 */
15struct page **ceph_get_direct_page_vector(const char __user *data, 15struct page **ceph_get_direct_page_vector(const void __user *data,
16 int num_pages, bool write_page) 16 int num_pages, bool write_page)
17{ 17{
18 struct page **pages; 18 struct page **pages;
@@ -93,7 +93,7 @@ EXPORT_SYMBOL(ceph_alloc_page_vector);
93 * copy user data into a page vector 93 * copy user data into a page vector
94 */ 94 */
95int ceph_copy_user_to_page_vector(struct page **pages, 95int ceph_copy_user_to_page_vector(struct page **pages,
96 const char __user *data, 96 const void __user *data,
97 loff_t off, size_t len) 97 loff_t off, size_t len)
98{ 98{
99 int i = 0; 99 int i = 0;
@@ -119,7 +119,7 @@ int ceph_copy_user_to_page_vector(struct page **pages,
119EXPORT_SYMBOL(ceph_copy_user_to_page_vector); 119EXPORT_SYMBOL(ceph_copy_user_to_page_vector);
120 120
121int ceph_copy_to_page_vector(struct page **pages, 121int ceph_copy_to_page_vector(struct page **pages,
122 const char *data, 122 const void *data,
123 loff_t off, size_t len) 123 loff_t off, size_t len)
124{ 124{
125 int i = 0; 125 int i = 0;
@@ -143,7 +143,7 @@ int ceph_copy_to_page_vector(struct page **pages,
143EXPORT_SYMBOL(ceph_copy_to_page_vector); 143EXPORT_SYMBOL(ceph_copy_to_page_vector);
144 144
145int ceph_copy_from_page_vector(struct page **pages, 145int ceph_copy_from_page_vector(struct page **pages,
146 char *data, 146 void *data,
147 loff_t off, size_t len) 147 loff_t off, size_t len)
148{ 148{
149 int i = 0; 149 int i = 0;
@@ -170,7 +170,7 @@ EXPORT_SYMBOL(ceph_copy_from_page_vector);
170 * copy user data from a page vector into a user pointer 170 * copy user data from a page vector into a user pointer
171 */ 171 */
172int ceph_copy_page_vector_to_user(struct page **pages, 172int ceph_copy_page_vector_to_user(struct page **pages,
173 char __user *data, 173 void __user *data,
174 loff_t off, size_t len) 174 loff_t off, size_t len)
175{ 175{
176 int i = 0; 176 int i = 0;