summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/uio.h4
-rw-r--r--lib/iov_iter.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/uio.h b/include/linux/uio.h
index 8b01e1c3c614..fd9bcfedad42 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -82,7 +82,7 @@ size_t copy_page_to_iter(struct page *page, size_t offset, size_t bytes,
82 struct iov_iter *i); 82 struct iov_iter *i);
83size_t copy_page_from_iter(struct page *page, size_t offset, size_t bytes, 83size_t copy_page_from_iter(struct page *page, size_t offset, size_t bytes,
84 struct iov_iter *i); 84 struct iov_iter *i);
85size_t copy_to_iter(void *addr, size_t bytes, struct iov_iter *i); 85size_t copy_to_iter(const void *addr, size_t bytes, struct iov_iter *i);
86size_t copy_from_iter(void *addr, size_t bytes, struct iov_iter *i); 86size_t copy_from_iter(void *addr, size_t bytes, struct iov_iter *i);
87size_t copy_from_iter_nocache(void *addr, size_t bytes, struct iov_iter *i); 87size_t copy_from_iter_nocache(void *addr, size_t bytes, struct iov_iter *i);
88size_t iov_iter_zero(size_t bytes, struct iov_iter *); 88size_t iov_iter_zero(size_t bytes, struct iov_iter *);
@@ -145,7 +145,7 @@ static inline void iov_iter_reexpand(struct iov_iter *i, size_t count)
145{ 145{
146 i->count = count; 146 i->count = count;
147} 147}
148size_t csum_and_copy_to_iter(void *addr, size_t bytes, __wsum *csum, struct iov_iter *i); 148size_t csum_and_copy_to_iter(const void *addr, size_t bytes, __wsum *csum, struct iov_iter *i);
149size_t csum_and_copy_from_iter(void *addr, size_t bytes, __wsum *csum, struct iov_iter *i); 149size_t csum_and_copy_from_iter(void *addr, size_t bytes, __wsum *csum, struct iov_iter *i);
150 150
151int import_iovec(int type, const struct iovec __user * uvector, 151int import_iovec(int type, const struct iovec __user * uvector,
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 75232ad0a5e7..bc6d85cc2036 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -369,7 +369,7 @@ static void memcpy_from_page(char *to, struct page *page, size_t offset, size_t
369 kunmap_atomic(from); 369 kunmap_atomic(from);
370} 370}
371 371
372static void memcpy_to_page(struct page *page, size_t offset, char *from, size_t len) 372static void memcpy_to_page(struct page *page, size_t offset, const char *from, size_t len)
373{ 373{
374 char *to = kmap_atomic(page); 374 char *to = kmap_atomic(page);
375 memcpy(to + offset, from, len); 375 memcpy(to + offset, from, len);
@@ -383,9 +383,9 @@ static void memzero_page(struct page *page, size_t offset, size_t len)
383 kunmap_atomic(addr); 383 kunmap_atomic(addr);
384} 384}
385 385
386size_t copy_to_iter(void *addr, size_t bytes, struct iov_iter *i) 386size_t copy_to_iter(const void *addr, size_t bytes, struct iov_iter *i)
387{ 387{
388 char *from = addr; 388 const char *from = addr;
389 if (unlikely(bytes > i->count)) 389 if (unlikely(bytes > i->count))
390 bytes = i->count; 390 bytes = i->count;
391 391
@@ -704,10 +704,10 @@ size_t csum_and_copy_from_iter(void *addr, size_t bytes, __wsum *csum,
704} 704}
705EXPORT_SYMBOL(csum_and_copy_from_iter); 705EXPORT_SYMBOL(csum_and_copy_from_iter);
706 706
707size_t csum_and_copy_to_iter(void *addr, size_t bytes, __wsum *csum, 707size_t csum_and_copy_to_iter(const void *addr, size_t bytes, __wsum *csum,
708 struct iov_iter *i) 708 struct iov_iter *i)
709{ 709{
710 char *from = addr; 710 const char *from = addr;
711 __wsum sum, next; 711 __wsum sum, next;
712 size_t off = 0; 712 size_t off = 0;
713 if (unlikely(bytes > i->count)) 713 if (unlikely(bytes > i->count))