lkml.org 
[lkml]   [2021]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 34/46] mm/filemap: Add i_blocks_per_folio()
    Date
    Reimplement i_blocks_per_page() as a wrapper around i_blocks_per_folio().

    Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
    ---
    include/linux/pagemap.h | 18 ++++++++++++------
    1 file changed, 12 insertions(+), 6 deletions(-)

    diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
    index 31edfa891987..c30db827b65d 100644
    --- a/include/linux/pagemap.h
    +++ b/include/linux/pagemap.h
    @@ -1149,19 +1149,25 @@ static inline int page_mkwrite_check_truncate(struct page *page,
    }

    /**
    - * i_blocks_per_page - How many blocks fit in this page.
    + * i_blocks_per_folio - How many blocks fit in this folio.
    * @inode: The inode which contains the blocks.
    - * @page: The page (head page if the page is a THP).
    + * @folio: The folio.
    *
    - * If the block size is larger than the size of this page, return zero.
    + * If the block size is larger than the size of this folio, return zero.
    *
    - * Context: The caller should hold a refcount on the page to prevent it
    + * Context: The caller should hold a refcount on the folio to prevent it
    * from being split.
    - * Return: The number of filesystem blocks covered by this page.
    + * Return: The number of filesystem blocks covered by this folio.
    */
    +static inline
    +unsigned int i_blocks_per_folio(struct inode *inode, struct folio *folio)
    +{
    + return folio_size(folio) >> inode->i_blkbits;
    +}
    +
    static inline
    unsigned int i_blocks_per_page(struct inode *inode, struct page *page)
    {
    - return thp_size(page) >> inode->i_blkbits;
    + return i_blocks_per_folio(inode, page_folio(page));
    }
    #endif /* _LINUX_PAGEMAP_H */
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-06-22 14:47    [W:4.027 / U:1.328 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site