iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iomap: Allow iomap_write_begin() to be called with the full length

Browse Source 
In the future, we want write_begin to know the entire length of the
write so that it can choose to allocate large folios.  Pass the full
length in from __iomap_zero_iter() and limit it where necessary.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2021-12-09 15:47:44 -05:00
parent ea0f843aa7
commit d454ab82bc
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/iomap/buffered-io.c
View File

@ -619,6 +619,9 @@ static int iomap_write_begin(const struct iomap_iter *iter, loff_t pos,
if (fatal_signal_pending(current)) if (fatal_signal_pending(current))
return -EINTR; return -EINTR;
if (!mapping_large_folio_support(iter->inode->i_mapping))
len = min_t(size_t, len, PAGE_SIZE - offset_in_page(pos));
if (page_ops && page_ops->page_prepare) { if (page_ops && page_ops->page_prepare) {
status = page_ops->page_prepare(iter->inode, pos, len); status = page_ops->page_prepare(iter->inode, pos, len);
if (status) if (status)
@ -632,6 +635,8 @@ static int iomap_write_begin(const struct iomap_iter *iter, loff_t pos,
goto out_no_page; goto out_no_page;
} }
folio = page_folio(page); folio = page_folio(page);
if (pos + len > folio_pos(folio) + folio_size(folio))
len = folio_pos(folio) + folio_size(folio) - pos;
if (srcmap->type == IOMAP_INLINE) if (srcmap->type == IOMAP_INLINE)
status = iomap_write_begin_inline(iter, page); status = iomap_write_begin_inline(iter, page);
@ -891,11 +896,13 @@ static s64 __iomap_zero_iter(struct iomap_iter *iter, loff_t pos, u64 length)
struct page *page; struct page *page;
int status; int status;
unsigned offset = offset_in_page(pos); unsigned offset = offset_in_page(pos);
unsigned bytes = min_t(u64, PAGE_SIZE - offset, length); unsigned bytes = min_t(u64, UINT_MAX, length);
status = iomap_write_begin(iter, pos, bytes, &page); status = iomap_write_begin(iter, pos, bytes, &page);
if (status) if (status)
return status; return status;
if (bytes > PAGE_SIZE - offset)
bytes = PAGE_SIZE - offset;
zero_user(page, offset, bytes); zero_user(page, offset, bytes);
mark_page_accessed(page); mark_page_accessed(page);