diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-06-18 20:34:33 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-08-07 14:40:11 -0400 |
| commit | c7f3888ad7f0932a87fb76e6e4edff2a90cc7920 (patch) | |
| tree | d108b0518699032b366b78fe461be3fc0fa307d2 /fs | |
| parent | 49c7dd287adffc972e6dd6cf7011d63c7c5c2e10 (diff) | |
| download | linux-stable-c7f3888ad7f0932a87fb76e6e4edff2a90cc7920.tar.gz linux-stable-c7f3888ad7f0932a87fb76e6e4edff2a90cc7920.tar.bz2 linux-stable-c7f3888ad7f0932a87fb76e6e4edff2a90cc7920.zip | |
switch iov_iter_get_pages() to passing maximal number of pages
... instead of maximal size.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/direct-io.c | 2 | ||||
| -rw-r--r-- | fs/fuse/file.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/direct-io.c b/fs/direct-io.c index 17e39b047de5..c3116404ab49 100644 --- 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)) { diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 40ac2628ddcf..912061ac4baf 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1303,10 +1303,10 @@ static int fuse_get_user_pages(struct fuse_req *req, struct iov_iter *ii, while (nbytes < *nbytesp && req->num_pages < req->max_pages) { unsigned npages; size_t start; - unsigned n = req->max_pages - req->num_pages; ssize_t ret = iov_iter_get_pages(ii, &req->pages[req->num_pages], - n * PAGE_SIZE, &start); + req->max_pages - req->num_pages, + &start); if (ret < 0) return ret; |