projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-microblaze.git]
/
mm
/
filemap.c
diff --git
a/mm/filemap.c
b/mm/filemap.c
index
b7b973b
..
6f1be57
100644
(file)
--- a/
mm/filemap.c
+++ b/
mm/filemap.c
@@
-2050,7
+2050,7
@@
generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
iocb->ki_pos += retval;
count -= retval;
}
- iov_iter_revert(iter,
iov_iter_count(iter) - count
);
+ iov_iter_revert(iter,
count - iov_iter_count(iter)
);
/*
* Btrfs can have a short DIO read if we encounter