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
This commit is contained in:
commit
0985b65d3b
|
@ -101,7 +101,7 @@
|
||||||
#define iterate_and_advance(i, n, v, I, B, K) { \
|
#define iterate_and_advance(i, n, v, I, B, K) { \
|
||||||
if (unlikely(i->count < n)) \
|
if (unlikely(i->count < n)) \
|
||||||
n = i->count; \
|
n = i->count; \
|
||||||
if (n) { \
|
if (i->count) { \
|
||||||
size_t skip = i->iov_offset; \
|
size_t skip = i->iov_offset; \
|
||||||
if (unlikely(i->type & ITER_BVEC)) { \
|
if (unlikely(i->type & ITER_BVEC)) { \
|
||||||
const struct bio_vec *bvec; \
|
const struct bio_vec *bvec; \
|
||||||
|
|
Loading…
Reference in New Issue