Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 903bb32e authored by Alex Elder's avatar Alex Elder
Browse files

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: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 23ed6e13

drivers/block/rbd.c

+2 −3
Original line number Diff line number Diff line
@@ -1890,8 +1890,7 @@ static int rbd_obj_method_sync(struct rbd_device *rbd_dev, 
	if (ret < 0)

		goto out;

	ret = 0;

	(void) ceph_copy_from_page_vector(pages, inbound, 0,

					obj_request->xferred);

	ceph_copy_from_page_vector(pages, inbound, 0, obj_request->xferred);

	if (version)

		*version = obj_request->version;

out:
@@ -2089,7 +2088,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev, 


	rbd_assert(obj_request->xferred <= (u64) SIZE_MAX);

	size = (size_t) obj_request->xferred;

	(void) ceph_copy_from_page_vector(pages, buf, 0, size);

	ceph_copy_from_page_vector(pages, buf, 0, size);

	rbd_assert(size <= (size_t) INT_MAX);

	ret = (int) size;

	if (version)

include/linux/ceph/libceph.h

+2 −2
Original line number Diff line number Diff line
@@ -232,10 +232,10 @@ 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 int ceph_copy_to_page_vector(struct page **pages,

extern void ceph_copy_to_page_vector(struct page **pages,

				    const void *data,

				    loff_t off, size_t len);

extern int ceph_copy_from_page_vector(struct page **pages,

extern void ceph_copy_from_page_vector(struct page **pages,

				    void *data,

				    loff_t off, size_t len);

extern int ceph_copy_page_vector_to_user(struct page **pages, void __user *data,

net/ceph/pagevec.c

+6 −8
Original line number Diff line number Diff line
@@ -118,17 +118,17 @@ int ceph_copy_user_to_page_vector(struct page **pages, 
}

EXPORT_SYMBOL(ceph_copy_user_to_page_vector);



int ceph_copy_to_page_vector(struct page **pages,

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_CACHE_MASK;

	size_t left = len;

	size_t l;



	while (left > 0) {

		l = min_t(size_t, PAGE_CACHE_SIZE-po, left);

		size_t l = min_t(size_t, PAGE_CACHE_SIZE-po, left);



		memcpy(page_address(pages[i]) + po, data, l);

		data += l;

		left -= l;
@@ -138,21 +138,20 @@ int ceph_copy_to_page_vector(struct page **pages, 
			i++;

		}

	}

	return len;

}

EXPORT_SYMBOL(ceph_copy_to_page_vector);



int ceph_copy_from_page_vector(struct page **pages,

void ceph_copy_from_page_vector(struct page **pages,

				    void *data,

				    loff_t off, size_t len)

{

	int i = 0;

	size_t po = off & ~PAGE_CACHE_MASK;

	size_t left = len;

	size_t l;



	while (left > 0) {

		l = min_t(size_t, PAGE_CACHE_SIZE-po, left);

		size_t l = min_t(size_t, PAGE_CACHE_SIZE-po, left);



		memcpy(data, page_address(pages[i]) + po, l);

		data += l;

		left -= l;
@@ -162,7 +161,6 @@ int ceph_copy_from_page_vector(struct page **pages, 
			i++;

		}

	}

	return len;

}

EXPORT_SYMBOL(ceph_copy_from_page_vector);