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 131/138] mm/truncate: Fix invalidate_complete_page2 for THPs
    Date
    invalidate_complete_page2() currently open-codes filemap_free_folio(),
    except for the part where it handles THP. Rather than adding that,
    call page_cache_free_page() from invalidate_complete_page2().

    Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
    ---
    mm/filemap.c | 3 +--
    mm/internal.h | 1 +
    mm/truncate.c | 5 +----
    3 files changed, 3 insertions(+), 6 deletions(-)

    diff --git a/mm/filemap.c b/mm/filemap.c
    index 97d17e8c76aa..d5787502c3be 100644
    --- a/mm/filemap.c
    +++ b/mm/filemap.c
    @@ -228,8 +228,7 @@ void __filemap_remove_folio(struct folio *folio, void *shadow)
    page_cache_delete(mapping, folio, shadow);
    }

    -static void filemap_free_folio(struct address_space *mapping,
    - struct folio *folio)
    +void filemap_free_folio(struct address_space *mapping, struct folio *folio)
    {
    void (*freepage)(struct page *);

    diff --git a/mm/internal.h b/mm/internal.h
    index 3e32064df18d..d63ef2595eff 100644
    --- a/mm/internal.h
    +++ b/mm/internal.h
    @@ -73,6 +73,7 @@ unsigned find_lock_entries(struct address_space *mapping, pgoff_t start,
    unsigned find_get_entries(struct address_space *mapping, pgoff_t start,
    pgoff_t end, struct pagevec *pvec, pgoff_t *indices);
    bool truncate_inode_partial_page(struct page *page, loff_t start, loff_t end);
    +void filemap_free_folio(struct address_space *mapping, struct folio *folio);

    /**
    * folio_evictable - Test whether a folio is evictable.
    diff --git a/mm/truncate.c b/mm/truncate.c
    index d068f22fe422..e000402e817b 100644
    --- a/mm/truncate.c
    +++ b/mm/truncate.c
    @@ -619,10 +619,7 @@ static int invalidate_complete_folio2(struct address_space *mapping,
    __filemap_remove_folio(folio, NULL);
    xa_unlock_irqrestore(&mapping->i_pages, flags);

    - if (mapping->a_ops->freepage)
    - mapping->a_ops->freepage(&folio->page);
    -
    - folio_ref_sub(folio, folio_nr_pages(folio)); /* pagecache ref */
    + filemap_free_folio(mapping, folio);
    return 1;
    failed:
    xa_unlock_irqrestore(&mapping->i_pages, flags);
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-15 07:24    [W:4.059 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site