Commit 1f65f52d authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'work.iov_iter' of... 

Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into read_iter

* 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  new helper: copy_to_iter_full()
parents fec50db7 e8205119

include/linux/uio.h

+10 −0
Original line number Diff line number Diff line
@@ -205,6 +205,16 @@ size_t copy_from_iter(void *addr, size_t bytes, struct iov_iter *i) 
	return 0;

}



static __always_inline __must_check

bool copy_to_iter_full(const void *addr, size_t bytes, struct iov_iter *i)

{

	size_t copied = copy_to_iter(addr, bytes, i);

	if (likely(copied == bytes))

		return true;

	iov_iter_revert(i, copied);

	return false;

}



static __always_inline __must_check

bool copy_from_iter_full(void *addr, size_t bytes, struct iov_iter *i)

{

include/net/udp.h

+1 −8
Original line number Diff line number Diff line
@@ -379,14 +379,7 @@ static inline bool udp_skb_is_linear(struct sk_buff *skb) 
static inline int copy_linear_skb(struct sk_buff *skb, int len, int off,

				  struct iov_iter *to)

{

	int n;



	n = copy_to_iter(skb->data + off, len, to);

	if (n == len)

		return 0;



	iov_iter_revert(to, n);

	return -EFAULT;

	return copy_to_iter_full(skb->data + off, len, to) ? 0 : -EFAULT;

}



/*