projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'upstream-3.17-rc1' of git://git.infradead.org/linux-ubifs
[firefly-linux-kernel-4.4.55.git]
/
fs
/
direct-io.c
diff --git
a/fs/direct-io.c
b/fs/direct-io.c
index 17e39b047de5b8a64349c86a5f9432efcb19f2e5..c3116404ab49a29c3b11fb53c175132f715750a5 100644
(file)
--- a/
fs/direct-io.c
+++ b/
fs/direct-io.c
@@
-158,7
+158,7
@@
static inline int dio_refill_pages(struct dio *dio, struct dio_submit *sdio)
{
ssize_t ret;
- ret = iov_iter_get_pages(sdio->iter, dio->pages, DIO_PAGES
* PAGE_SIZE
,
+ ret = iov_iter_get_pages(sdio->iter, dio->pages, DIO_PAGES,
&sdio->from);
if (ret < 0 && sdio->blocks_available && (dio->rw & WRITE)) {