diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-05-26 09:16:25 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-05-26 09:16:25 +0200 |
| commit | ed0d523adb5d05d6d7feea572c518e86ff8d1e96 (patch) | |
| tree | 9ff57c35631ce9d82130849775c72acc3a600e2f /lib | |
| parent | aio: implement io_pgetevents (diff) | |
| parent | fix io_destroy()/aio_complete() race (diff) | |
| download | linux-ed0d523adb5d05d6d7feea572c518e86ff8d1e96.tar.xz linux-ed0d523adb5d05d6d7feea572c518e86ff8d1e96.zip | |
Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into aio-base
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/iov_iter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/iov_iter.c b/lib/iov_iter.c index 970212670b6a..fdae394172fa 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -1012,7 +1012,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, @@ -1102,7 +1102,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; |