Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

libceph: drop return value from page vector copy routines

The return values provided for ceph_copy_to_page_vector() and
ceph_copy_from_page_vector() serve no purpose, so get rid of them.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

+10 -13
+2 -3
drivers/block/rbd.c
··· 1890 1890 if (ret < 0) 1891 1891 goto out; 1892 1892 ret = 0; 1893 - (void) ceph_copy_from_page_vector(pages, inbound, 0, 1894 - obj_request->xferred); 1893 + ceph_copy_from_page_vector(pages, inbound, 0, obj_request->xferred); 1895 1894 if (version) 1896 1895 *version = obj_request->version; 1897 1896 out: ··· 2088 2089 2089 2090 rbd_assert(obj_request->xferred <= (u64) SIZE_MAX); 2090 2091 size = (size_t) obj_request->xferred; 2091 - (void) ceph_copy_from_page_vector(pages, buf, 0, size); 2092 + ceph_copy_from_page_vector(pages, buf, 0, size); 2092 2093 rbd_assert(size <= (size_t) INT_MAX); 2093 2094 ret = (int) size; 2094 2095 if (version)
+2 -2
include/linux/ceph/libceph.h
··· 232 232 extern int ceph_copy_user_to_page_vector(struct page **pages, 233 233 const void __user *data, 234 234 loff_t off, size_t len); 235 - extern int ceph_copy_to_page_vector(struct page **pages, 235 + extern void ceph_copy_to_page_vector(struct page **pages, 236 236 const void *data, 237 237 loff_t off, size_t len); 238 - extern int ceph_copy_from_page_vector(struct page **pages, 238 + extern void ceph_copy_from_page_vector(struct page **pages, 239 239 void *data, 240 240 loff_t off, size_t len); 241 241 extern int ceph_copy_page_vector_to_user(struct page **pages, void __user *data,
+6 -8
net/ceph/pagevec.c
··· 118 118 } 119 119 EXPORT_SYMBOL(ceph_copy_user_to_page_vector); 120 120 121 - int ceph_copy_to_page_vector(struct page **pages, 121 + void ceph_copy_to_page_vector(struct page **pages, 122 122 const void *data, 123 123 loff_t off, size_t len) 124 124 { 125 125 int i = 0; 126 126 size_t po = off & ~PAGE_CACHE_MASK; 127 127 size_t left = len; 128 - size_t l; 129 128 130 129 while (left > 0) { 131 - l = min_t(size_t, PAGE_CACHE_SIZE-po, left); 130 + size_t l = min_t(size_t, PAGE_CACHE_SIZE-po, left); 131 + 132 132 memcpy(page_address(pages[i]) + po, data, l); 133 133 data += l; 134 134 left -= l; ··· 138 138 i++; 139 139 } 140 140 } 141 - return len; 142 141 } 143 142 EXPORT_SYMBOL(ceph_copy_to_page_vector); 144 143 145 - int ceph_copy_from_page_vector(struct page **pages, 144 + void ceph_copy_from_page_vector(struct page **pages, 146 145 void *data, 147 146 loff_t off, size_t len) 148 147 { 149 148 int i = 0; 150 149 size_t po = off & ~PAGE_CACHE_MASK; 151 150 size_t left = len; 152 - size_t l; 153 151 154 152 while (left > 0) { 155 - l = min_t(size_t, PAGE_CACHE_SIZE-po, left); 153 + size_t l = min_t(size_t, PAGE_CACHE_SIZE-po, left); 154 + 156 155 memcpy(data, page_address(pages[i]) + po, l); 157 156 data += l; 158 157 left -= l; ··· 161 162 i++; 162 163 } 163 164 } 164 - return len; 165 165 } 166 166 EXPORT_SYMBOL(ceph_copy_from_page_vector); 167 167