summaryrefslogtreecommitdiffstats
path: root/include/linux/uio.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-10-10 13:38:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-10 13:38:49 -0700
commitfed41f7d039bad02f94cad9059e4b14cd81d13f2 (patch)
treefb9de8dfd1e706a0657e213d5d3cd9368b9e58e4 /include/linux/uio.h
parentabb5a14fa20fdd400995926134b7be9eb8ce6048 (diff)
parentcd27e455042da85b088bdd3a6e00da1d5b4df9f1 (diff)
downloadlinux-stable-fed41f7d039bad02f94cad9059e4b14cd81d13f2.tar.gz
linux-stable-fed41f7d039bad02f94cad9059e4b14cd81d13f2.tar.bz2
linux-stable-fed41f7d039bad02f94cad9059e4b14cd81d13f2.zip
Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull splice fixups from Al Viro: "A couple of fixups for interaction of pipe-backed iov_iter with O_DIRECT reads + constification of a couple of primitives in uio.h missed by previous rounds. Kudos to davej - his fuzzing has caught those bugs" * 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: [btrfs] fix check_direct_IO() for non-iovec iterators constify iov_iter_count() and iter_is_iovec() fix ITER_PIPE interaction with direct_IO
Diffstat (limited to 'include/linux/uio.h')
-rw-r--r--include/linux/uio.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/uio.h b/include/linux/uio.h
index a00d525bbffa..6e22b544d039 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -109,12 +109,12 @@ int iov_iter_npages(const struct iov_iter *i, int maxpages);
const void *dup_iter(struct iov_iter *new, struct iov_iter *old, gfp_t flags);
-static inline size_t iov_iter_count(struct iov_iter *i)
+static inline size_t iov_iter_count(const struct iov_iter *i)
{
return i->count;
}
-static inline bool iter_is_iovec(struct iov_iter *i)
+static inline bool iter_is_iovec(const struct iov_iter *i)
{
return !(i->type & (ITER_BVEC | ITER_KVEC | ITER_PIPE));
}