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>

diff --git a/fs/direct-io.c b/fs/direct-io.c
index 17e39b0..c311640 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)) {

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 40ac262..912061a 100644 (file)
--- 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;
 

diff --git a/include/linux/uio.h b/include/linux/uio.h
index 09a7cff..48d64e6 100644 (file)
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -84,7 +84,7 @@ unsigned long iov_iter_alignment(const struct iov_iter *i);
 void iov_iter_init(struct iov_iter *i, int direction, const struct iovec *iov,
                        unsigned long nr_segs, size_t count);
 ssize_t iov_iter_get_pages(struct iov_iter *i, struct page **pages,
-                       size_t maxsize, size_t *start);
+                       unsigned maxpages, size_t *start);
 ssize_t iov_iter_get_pages_alloc(struct iov_iter *i, struct page ***pages,
                        size_t maxsize, size_t *start);
 int iov_iter_npages(const struct iov_iter *i, int maxpages);

diff --cc mm/iov_iter.c
Simple merge