diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-26 00:59:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-26 00:59:09 +0200 |
| commit | 0985b65d3ba2c09f10a594b73df45c1f7f68d317 (patch) | |
| tree | 1d03cafe5960e3440b3a6e4a16b8e0d09313957f /lib | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| parent | do "fold checks into iterate_and_advance()" right (diff) | |
| download | linux-0985b65d3ba2c09f10a594b73df45c1f7f68d317.tar.xz linux-0985b65d3ba2c09f10a594b73df45c1f7f68d317.zip | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/iov_iter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/iov_iter.c b/lib/iov_iter.c index 28cb4315fe57..0cd522753ff5 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -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; \ |