lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v13 114/137] mm/filemap: Convert filemap_create_page to folio
    Date
    This is all internal to filemap and saves 100 bytes of text.

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

    diff --git a/mm/filemap.c b/mm/filemap.c
    index 827e8872d2bd..537d3026cefa 100644
    --- a/mm/filemap.c
    +++ b/mm/filemap.c
    @@ -2396,32 +2396,32 @@ static int filemap_update_page(struct kiocb *iocb,
    return error;
    }

    -static int filemap_create_page(struct file *file,
    +static int filemap_create_folio(struct file *file,
    struct address_space *mapping, pgoff_t index,
    struct pagevec *pvec)
    {
    - struct page *page;
    + struct folio *folio;
    int error;

    - page = page_cache_alloc(mapping);
    - if (!page)
    + folio = filemap_alloc_folio(mapping_gfp_mask(mapping), 0);
    + if (!folio)
    return -ENOMEM;

    - error = add_to_page_cache_lru(page, mapping, index,
    + error = filemap_add_folio(mapping, folio, index,
    mapping_gfp_constraint(mapping, GFP_KERNEL));
    if (error == -EEXIST)
    error = AOP_TRUNCATED_PAGE;
    if (error)
    goto error;

    - error = filemap_read_folio(file, mapping, page_folio(page));
    + error = filemap_read_folio(file, mapping, folio);
    if (error)
    goto error;

    - pagevec_add(pvec, page);
    + pagevec_add(pvec, &folio->page);
    return 0;
    error:
    - put_page(page);
    + folio_put(folio);
    return error;
    }

    @@ -2463,7 +2463,7 @@ static int filemap_get_pages(struct kiocb *iocb, struct iov_iter *iter,
    if (!pagevec_count(pvec)) {
    if (iocb->ki_flags & (IOCB_NOWAIT | IOCB_WAITQ))
    return -EAGAIN;
    - err = filemap_create_page(filp, mapping,
    + err = filemap_create_folio(filp, mapping,
    iocb->ki_pos >> PAGE_SHIFT, pvec);
    if (err == AOP_TRUNCATED_PAGE)
    goto retry;
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-12 06:09    [W:3.627 / U:1.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site