Commit 40a86061 authored by Al Viro's avatar Al Viro
Browse files

get rid of unlikely() on page_copy_sane() calls 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent eb708140

lib/iov_iter.c

+5 −6
Original line number Diff line number Diff line
@@ -703,17 +703,16 @@ static inline bool page_copy_sane(struct page *page, size_t offset, size_t n) 
	head = compound_head(page);

	v += (page - head) << PAGE_SHIFT;



	if (likely(n <= v && v <= (page_size(head))))

		return true;

	WARN_ON(1);

	if (WARN_ON(n > v || v > page_size(head)))

		return false;

	return true;

}



size_t copy_page_to_iter(struct page *page, size_t offset, size_t bytes,

			 struct iov_iter *i)

{

	size_t res = 0;

	if (unlikely(!page_copy_sane(page, offset, bytes)))

	if (!page_copy_sane(page, offset, bytes))

		return 0;

	if (unlikely(iov_iter_is_pipe(i)))

		return copy_page_to_iter_pipe(page, offset, bytes, i);
@@ -808,7 +807,7 @@ size_t copy_page_from_iter_atomic(struct page *page, unsigned offset, size_t byt 
				  struct iov_iter *i)

{

	char *kaddr = kmap_atomic(page), *p = kaddr + offset;

	if (unlikely(!page_copy_sane(page, offset, bytes))) {

	if (!page_copy_sane(page, offset, bytes)) {

		kunmap_atomic(kaddr);

		return 0;

	}