mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 21:33:52 +00:00
iov_iter: Map the page later in copy_page_from_iter_atomic()
Remove a couple of calls to kunmap_atomic() in the rare error cases. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Kent Overstreet <kent.overstreet@linux.dev> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
parent
6eaae19807
commit
f7f9a0c873
1 changed files with 8 additions and 8 deletions
|
@ -569,20 +569,20 @@ EXPORT_SYMBOL(iov_iter_zero);
|
||||||
size_t copy_page_from_iter_atomic(struct page *page, unsigned offset, size_t bytes,
|
size_t copy_page_from_iter_atomic(struct page *page, unsigned offset, size_t bytes,
|
||||||
struct iov_iter *i)
|
struct iov_iter *i)
|
||||||
{
|
{
|
||||||
char *kaddr = kmap_atomic(page), *p = kaddr + offset;
|
char *p;
|
||||||
if (!page_copy_sane(page, offset, bytes)) {
|
|
||||||
kunmap_atomic(kaddr);
|
if (!page_copy_sane(page, offset, bytes))
|
||||||
return 0;
|
return 0;
|
||||||
}
|
if (WARN_ON_ONCE(!i->data_source))
|
||||||
if (WARN_ON_ONCE(!i->data_source)) {
|
|
||||||
kunmap_atomic(kaddr);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
|
||||||
|
p = kmap_atomic(page) + offset;
|
||||||
iterate_and_advance(i, bytes, base, len, off,
|
iterate_and_advance(i, bytes, base, len, off,
|
||||||
copyin(p + off, base, len),
|
copyin(p + off, base, len),
|
||||||
memcpy_from_iter(i, p + off, base, len)
|
memcpy_from_iter(i, p + off, base, len)
|
||||||
)
|
)
|
||||||
kunmap_atomic(kaddr);
|
kunmap_atomic(p);
|
||||||
|
|
||||||
return bytes;
|
return bytes;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(copy_page_from_iter_atomic);
|
EXPORT_SYMBOL(copy_page_from_iter_atomic);
|
||||||
|
|
Loading…
Reference in a new issue