Merge branch 'for-4.18/mcsafe' into libnvdimm-for-next

[linux-2.6-block.git] / lib / iov_iter.c

diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 70ebc8ede143f7599b482cc4e0704fde5ef99188..7e43cd54c84ca3da2d77b02e7112c69386428a2b 100644 (file)
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -1073,7 +1073,7 @@ unsigned long iov_iter_gap_alignment(const struct iov_iter *i)
 }
 EXPORT_SYMBOL(iov_iter_gap_alignment);
 
-static inline size_t __pipe_get_pages(struct iov_iter *i,
+static inline ssize_t __pipe_get_pages(struct iov_iter *i,
                                size_t maxsize,
                                struct page **pages,
                                int idx,
@@ -1163,7 +1163,7 @@ static ssize_t pipe_get_pages_alloc(struct iov_iter *i,
                   size_t *start)
 {
        struct page **p;
-       size_t n;
+       ssize_t n;
        int idx;
        int npages;