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

Commit c7f36857 authored by Al Viro's avatar Al Viro
Browse files

Merge branch 'iov_iter' into for-davem-2

parents d6b00fec aa583096

include/linux/uio.h

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ struct iov_iter { 
	size_t count;

	union {

		const struct iovec *iov;

		const struct kvec *kvec;

		const struct bio_vec *bvec;

	};

	unsigned long nr_segs;
@@ -82,10 +83,13 @@ size_t copy_page_from_iter(struct page *page, size_t offset, size_t bytes, 
			 struct iov_iter *i);

size_t copy_to_iter(void *addr, size_t bytes, struct iov_iter *i);

size_t copy_from_iter(void *addr, size_t bytes, struct iov_iter *i);

size_t copy_from_iter_nocache(void *addr, size_t bytes, struct iov_iter *i);

size_t iov_iter_zero(size_t bytes, struct iov_iter *);

unsigned long iov_iter_alignment(const struct iov_iter *i);

void iov_iter_init(struct iov_iter *i, int direction, const struct iovec *iov,

			unsigned long nr_segs, size_t count);

void iov_iter_kvec(struct iov_iter *i, int direction, const struct kvec *iov,

			unsigned long nr_segs, size_t count);

ssize_t iov_iter_get_pages(struct iov_iter *i, struct page **pages,

			size_t maxsize, unsigned maxpages, size_t *start);

ssize_t iov_iter_get_pages_alloc(struct iov_iter *i, struct page ***pages,
@@ -123,6 +127,8 @@ static inline void iov_iter_reexpand(struct iov_iter *i, size_t count) 
{

	i->count = count;

}

size_t csum_and_copy_to_iter(void *addr, size_t bytes, __wsum *csum, struct iov_iter *i);

size_t csum_and_copy_from_iter(void *addr, size_t bytes, __wsum *csum, struct iov_iter *i);



int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len);

int memcpy_toiovec(struct iovec *iov, unsigned char *kdata, int len);

mm/iov_iter.c

+420 −638

File changed.

Preview size limit exceeded, changes collapsed.