diff --git a/[refs] b/[refs] index 39f0882a5b29..45dc215f798c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85f40aec887110ae6bbefa87988def4606a3d583 +refs/heads/master: d28574e043e8b7cb35482de6e9a553118a32803d diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index 7617ee04f066..7d2e893ec3d1 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -301,7 +301,7 @@ size_t iov_iter_copy_from_user(struct page *page, struct iov_iter *i, unsigned long offset, size_t bytes); void iov_iter_advance(struct iov_iter *i, size_t bytes); int iov_iter_fault_in_readable(struct iov_iter *i, size_t bytes); -size_t iov_iter_single_seg_count(struct iov_iter *i); +size_t iov_iter_single_seg_count(const struct iov_iter *i); static inline void iov_iter_init(struct iov_iter *i, const struct iovec *iov, unsigned long nr_segs, diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c index 83efee76a5c0..24a7ea583f0c 100644 --- a/trunk/mm/filemap.c +++ b/trunk/mm/filemap.c @@ -2056,7 +2056,7 @@ EXPORT_SYMBOL(iov_iter_fault_in_readable); /* * Return the count of just the current iov_iter segment. */ -size_t iov_iter_single_seg_count(struct iov_iter *i) +size_t iov_iter_single_seg_count(const struct iov_iter *i) { const struct iovec *iov = i->iov; if (i->nr_segs == 1)