Commit 0985b65d authored May 25, 2016 by Linus Torvalds

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

Pull vfs iov_iter regression fix from Al Viro:
 "Fix for braino in 'fold checks into iterate_and_advance()'"

* 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  do "fold checks into iterate_and_advance()" right

parents 55c1c7b2 19f18459

lib/iov_iter.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@
		#define iterate_and_advance(i, n, v, I, B, K) { \
		if (unlikely(i->count < n)) \
		n = i->count; \
		if (n) { \
		if (i->count) { \
		size_t skip = i->iov_offset; \
		if (unlikely(i->type & ITER_BVEC)) { \
		const struct bio_vec *bvec; \