Commit 8c9a694d authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull iov iter fix from Al Viro.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix a braino in ITER_PIPE iov_iter_revert()
parents 0060e79a 4fa55cef
...@@ -798,7 +798,7 @@ void iov_iter_revert(struct iov_iter *i, size_t unroll) ...@@ -798,7 +798,7 @@ void iov_iter_revert(struct iov_iter *i, size_t unroll)
while (1) { while (1) {
size_t n = off - pipe->bufs[idx].offset; size_t n = off - pipe->bufs[idx].offset;
if (unroll < n) { if (unroll < n) {
off -= (n - unroll); off -= unroll;
break; break;
} }
unroll -= n; unroll -= n;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment