Re: [PATCH v14 104/138] iomap: Convert iomap_write_end_inline to take a folio

Darrick J. Wong
2021-07-15T21:55:16Z

On Thu, Jul 15, 2021 at 04:36:30AM +0100, Matthew Wilcox (Oracle) wrote:
> Inline data only occupies a single page, but using a folio means that
> we don't need to call compound_head() in PageUptodate().
>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

/me isn't the expert on inlinedata, but this looks reasonable to me...

Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D

> ---
> fs/iomap/buffered-io.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
> index c616ef1feb21..ac33f19325ab 100644
> --- a/fs/iomap/buffered-io.c
> +++ b/fs/iomap/buffered-io.c
> @@ -662,18 +662,18 @@ static size_t __iomap_write_end(struct inode *inode, loff_t pos, size_t len,
> return copied;
> }
>
> -static size_t iomap_write_end_inline(struct inode *inode, struct page *page,
> +static size_t iomap_write_end_inline(struct inode *inode, struct folio *folio,
> struct iomap *iomap, loff_t pos, size_t copied)
> {
> void *addr;
>
> - WARN_ON_ONCE(!PageUptodate(page));
> + WARN_ON_ONCE(!folio_test_uptodate(folio));
> BUG_ON(pos + copied > PAGE_SIZE - offset_in_page(iomap->inline_data));
>
> - flush_dcache_page(page);
> - addr = kmap_atomic(page);
> + flush_dcache_folio(folio);
> + addr = kmap_local_folio(folio, 0);
> memcpy(iomap->inline_data + pos, addr + pos, copied);
> - kunmap_atomic(addr);
> + kunmap_local(addr);
>
> mark_inode_dirty(inode);
> return copied;
> @@ -690,7 +690,7 @@ static size_t iomap_write_end(struct inode *inode, loff_t pos, size_t len,
> size_t ret;
>
> if (srcmap->type == IOMAP_INLINE) {
> - ret = iomap_write_end_inline(inode, page, iomap, pos, copied);
> + ret = iomap_write_end_inline(inode, folio, iomap, pos, copied);
> } else if (srcmap->flags & IOMAP_F_BUFFER_HEAD) {
> ret = block_write_end(NULL, inode->i_mapping, pos, len, copied,
> page, NULL);
> --
> 2.30.2
>