lkml.org 
[lkml]   [2021]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v14 103/138] iomap: Convert iomap_read_inline_data to take a folio
    Date
    Inline data is restricted to being less than a page in size, so we
    don't need to handle multi-page folios.

    Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
    ---
    fs/iomap/buffered-io.c | 18 +++++++++---------
    1 file changed, 9 insertions(+), 9 deletions(-)

    diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
    index 5e0aa23d4693..c616ef1feb21 100644
    --- a/fs/iomap/buffered-io.c
    +++ b/fs/iomap/buffered-io.c
    @@ -194,24 +194,24 @@ struct iomap_readpage_ctx {
    struct readahead_control *rac;
    };

    -static void
    -iomap_read_inline_data(struct inode *inode, struct page *page,
    +static void iomap_read_inline_data(struct inode *inode, struct folio *folio,
    struct iomap *iomap)
    {
    size_t size = i_size_read(inode);
    void *addr;

    - if (PageUptodate(page))
    + if (folio_test_uptodate(folio))
    return;

    - BUG_ON(page->index);
    + BUG_ON(folio->index);
    + BUG_ON(folio_multi(folio));
    BUG_ON(size > PAGE_SIZE - offset_in_page(iomap->inline_data));

    - addr = kmap_atomic(page);
    + addr = kmap_local_folio(folio, 0);
    memcpy(addr, iomap->inline_data, size);
    memset(addr + size, 0, PAGE_SIZE - size);
    - kunmap_atomic(addr);
    - SetPageUptodate(page);
    + kunmap_local(addr);
    + folio_mark_uptodate(folio);
    }

    static inline bool iomap_block_needs_zeroing(struct inode *inode,
    @@ -236,7 +236,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data,

    if (iomap->type == IOMAP_INLINE) {
    WARN_ON_ONCE(pos);
    - iomap_read_inline_data(inode, &folio->page, iomap);
    + iomap_read_inline_data(inode, folio, iomap);
    return PAGE_SIZE;
    }

    @@ -614,7 +614,7 @@ static int iomap_write_begin(struct inode *inode, loff_t pos, size_t len,

    page = folio_file_page(folio, pos >> PAGE_SHIFT);
    if (srcmap->type == IOMAP_INLINE)
    - iomap_read_inline_data(inode, page, srcmap);
    + iomap_read_inline_data(inode, folio, srcmap);
    else if (iomap->flags & IOMAP_F_BUFFER_HEAD)
    status = __block_write_begin_int(page, pos, len, NULL, srcmap);
    else
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-15 07:01    [W:3.587 / U:0.488 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site