Skip to content

Commit ee1eb8c

Browse files
Dr. David Alan Gilbertidryomov
authored andcommitted
libceph: Remove unused pagevec functions
ceph_copy_user_to_page_vector() has been unused since 2013's commit e8344e6 ("ceph: Implement writev/pwritev for sync operation.") ceph_copy_to_page_vector() has been unused since 2012's commit 913d2fd ("rbd: always pass ops array to rbd_req_sync_op()") Remove them. Signed-off-by: Dr. David Alan Gilbert <[email protected]> Reviewed-by: Ilya Dryomov <[email protected]> Signed-off-by: Ilya Dryomov <[email protected]>
1 parent 0385492 commit ee1eb8c

File tree

2 files changed

+0
-58
lines changed

2 files changed

+0
-58
lines changed

include/linux/ceph/libceph.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -317,12 +317,6 @@ extern void ceph_release_page_vector(struct page **pages, int num_pages);
317317
extern void ceph_put_page_vector(struct page **pages, int num_pages,
318318
bool dirty);
319319
extern struct page **ceph_alloc_page_vector(int num_pages, gfp_t flags);
320-
extern int ceph_copy_user_to_page_vector(struct page **pages,
321-
const void __user *data,
322-
loff_t off, size_t len);
323-
extern void ceph_copy_to_page_vector(struct page **pages,
324-
const void *data,
325-
loff_t off, size_t len);
326320
extern void ceph_copy_from_page_vector(struct page **pages,
327321
void *data,
328322
loff_t off, size_t len);

net/ceph/pagevec.c

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -55,58 +55,6 @@ struct page **ceph_alloc_page_vector(int num_pages, gfp_t flags)
5555
}
5656
EXPORT_SYMBOL(ceph_alloc_page_vector);
5757

58-
/*
59-
* copy user data into a page vector
60-
*/
61-
int ceph_copy_user_to_page_vector(struct page **pages,
62-
const void __user *data,
63-
loff_t off, size_t len)
64-
{
65-
int i = 0;
66-
int po = off & ~PAGE_MASK;
67-
int left = len;
68-
int l, bad;
69-
70-
while (left > 0) {
71-
l = min_t(int, PAGE_SIZE-po, left);
72-
bad = copy_from_user(page_address(pages[i]) + po, data, l);
73-
if (bad == l)
74-
return -EFAULT;
75-
data += l - bad;
76-
left -= l - bad;
77-
po += l - bad;
78-
if (po == PAGE_SIZE) {
79-
po = 0;
80-
i++;
81-
}
82-
}
83-
return len;
84-
}
85-
EXPORT_SYMBOL(ceph_copy_user_to_page_vector);
86-
87-
void ceph_copy_to_page_vector(struct page **pages,
88-
const void *data,
89-
loff_t off, size_t len)
90-
{
91-
int i = 0;
92-
size_t po = off & ~PAGE_MASK;
93-
size_t left = len;
94-
95-
while (left > 0) {
96-
size_t l = min_t(size_t, PAGE_SIZE-po, left);
97-
98-
memcpy(page_address(pages[i]) + po, data, l);
99-
data += l;
100-
left -= l;
101-
po += l;
102-
if (po == PAGE_SIZE) {
103-
po = 0;
104-
i++;
105-
}
106-
}
107-
}
108-
EXPORT_SYMBOL(ceph_copy_to_page_vector);
109-
11058
void ceph_copy_from_page_vector(struct page **pages,
11159
void *data,
11260
loff_t off, size_t len)

0 commit comments

Comments
 (0)