diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-04-08 19:05:19 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-04-08 19:46:28 -0400 |
commit | 357f435d8a0d32068c75f3c7176434d992b3adb7 (patch) | |
tree | 036a03d154f9910fe94a7b27b5144d04fea6ddc3 /lib/iov_iter.c | |
parent | 03cc0789a690eb9ab07070376252961caeae7441 (diff) | |
download | linux-stable-357f435d8a0d32068c75f3c7176434d992b3adb7.tar.gz linux-stable-357f435d8a0d32068c75f3c7176434d992b3adb7.tar.bz2 linux-stable-357f435d8a0d32068c75f3c7176434d992b3adb7.zip |
fix the copy vs. map logics in blk_rq_map_user_iov()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'lib/iov_iter.c')
-rw-r--r-- | lib/iov_iter.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/lib/iov_iter.c b/lib/iov_iter.c index 5fecddc32b1b..ca5316e0087b 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -569,6 +569,25 @@ unsigned long iov_iter_alignment(const struct iov_iter *i) } EXPORT_SYMBOL(iov_iter_alignment); +unsigned long iov_iter_gap_alignment(const struct iov_iter *i) +{ + unsigned long res = 0; + size_t size = i->count; + if (!size) + return 0; + + iterate_all_kinds(i, size, v, + (res |= (!res ? 0 : (unsigned long)v.iov_base) | + (size != v.iov_len ? size : 0), 0), + (res |= (!res ? 0 : (unsigned long)v.bv_offset) | + (size != v.bv_len ? size : 0)), + (res |= (!res ? 0 : (unsigned long)v.iov_base) | + (size != v.iov_len ? size : 0)) + ); + return res; +} +EXPORT_SYMBOL(iov_iter_gap_alignment); + ssize_t iov_iter_get_pages(struct iov_iter *i, struct page **pages, size_t maxsize, unsigned maxpages, size_t *start) |