lkml.org 
[lkml]   [2021]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v14 129/138] xfs: Support THPs
    On Thu, Jul 15, 2021 at 04:36:55AM +0100, Matthew Wilcox (Oracle) wrote:
    > There is one place which assumes the size of a page; fix it.
    >
    > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
    > ---
    > fs/xfs/xfs_aops.c | 11 ++++++-----
    > fs/xfs/xfs_super.c | 3 ++-
    > 2 files changed, 8 insertions(+), 6 deletions(-)
    >
    > diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
    > index cb4e0fcf4c76..9ffbd116592a 100644
    > --- a/fs/xfs/xfs_aops.c
    > +++ b/fs/xfs/xfs_aops.c
    > @@ -432,10 +432,11 @@ xfs_discard_page(
    > struct page *page,
    > loff_t fileoff)

    /me wonders if this parameter ought to become pos like most other
    places, but as a straight-up conversion it looks fine to me.

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

    --D

    > {
    > - struct inode *inode = page->mapping->host;
    > + struct folio *folio = page_folio(page);
    > + struct inode *inode = folio->mapping->host;
    > struct xfs_inode *ip = XFS_I(inode);
    > struct xfs_mount *mp = ip->i_mount;
    > - unsigned int pageoff = offset_in_page(fileoff);
    > + size_t pageoff = offset_in_folio(folio, fileoff);
    > xfs_fileoff_t start_fsb = XFS_B_TO_FSBT(mp, fileoff);
    > xfs_fileoff_t pageoff_fsb = XFS_B_TO_FSBT(mp, pageoff);
    > int error;
    > @@ -445,14 +446,14 @@ xfs_discard_page(
    >
    > xfs_alert_ratelimited(mp,
    > "page discard on page "PTR_FMT", inode 0x%llx, offset %llu.",
    > - page, ip->i_ino, fileoff);
    > + folio, ip->i_ino, fileoff);
    >
    > error = xfs_bmap_punch_delalloc_range(ip, start_fsb,
    > - i_blocks_per_page(inode, page) - pageoff_fsb);
    > + i_blocks_per_folio(inode, folio) - pageoff_fsb);
    > if (error && !XFS_FORCED_SHUTDOWN(mp))
    > xfs_alert(mp, "page discard unable to remove delalloc mapping.");
    > out_invalidate:
    > - iomap_invalidatepage(page, pageoff, PAGE_SIZE - pageoff);
    > + iomap_invalidatepage(&folio->page, pageoff, folio_size(folio) - pageoff);
    > }
    >
    > static const struct iomap_writeback_ops xfs_writeback_ops = {
    > diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
    > index 2c9e26a44546..24adea02b887 100644
    > --- a/fs/xfs/xfs_super.c
    > +++ b/fs/xfs/xfs_super.c
    > @@ -1891,7 +1891,8 @@ static struct file_system_type xfs_fs_type = {
    > .init_fs_context = xfs_init_fs_context,
    > .parameters = xfs_fs_parameters,
    > .kill_sb = kill_block_super,
    > - .fs_flags = FS_REQUIRES_DEV | FS_ALLOW_IDMAP,
    > + .fs_flags = FS_REQUIRES_DEV | FS_ALLOW_IDMAP | \
    > + FS_THP_SUPPORT,
    > };
    > MODULE_ALIAS_FS("xfs");
    >
    > --
    > 2.30.2
    >

    \
     
     \ /
      Last update: 2021-07-16 00:12    [W:4.039 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site