diff options
author | David S. Miller <davem@davemloft.net> | 2017-04-06 11:57:04 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-04-06 11:57:04 -0700 |
commit | 0e4c0ee580749502e25609b83082ac8d92c13023 (patch) | |
tree | 92e0754024246e133dda4f9cacd70615d1857e33 /include/linux/uio.h | |
parent | ea6b1720ce25f92f7a17b2e0c2b653d20773d10a (diff) | |
parent | 3278682123811dd8ef07de5eb701fc4548fcebf2 (diff) | |
download | linux-stable-0e4c0ee580749502e25609b83082ac8d92c13023.tar.gz linux-stable-0e4c0ee580749502e25609b83082ac8d92c13023.tar.bz2 linux-stable-0e4c0ee580749502e25609b83082ac8d92c13023.zip |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Diffstat (limited to 'include/linux/uio.h')
-rw-r--r-- | include/linux/uio.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/uio.h b/include/linux/uio.h index 804e34c6f981..f2d36a3d3005 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -39,7 +39,10 @@ struct iov_iter { }; union { unsigned long nr_segs; - int idx; + struct { + int idx; + int start_idx; + }; }; }; @@ -81,6 +84,7 @@ unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to); size_t iov_iter_copy_from_user_atomic(struct page *page, struct iov_iter *i, unsigned long offset, size_t bytes); void iov_iter_advance(struct iov_iter *i, size_t bytes); +void iov_iter_revert(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(const struct iov_iter *i); size_t copy_page_to_iter(struct page *page, size_t offset, size_t bytes, |