lkml.org 
[lkml]   [2016]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v5 16/17] xfs: use struct iomap based DAX PMD fault path
    On Fri 07-10-16 15:09:03, Ross Zwisler wrote:
    > Switch xfs_filemap_pmd_fault() from using dax_pmd_fault() to the new and
    > improved dax_iomap_pmd_fault(). Also, now that it has no more users,
    > remove xfs_get_blocks_dax_fault().
    >
    > Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>

    The patch looks good to me. You can add:

    Reviewed-by: Jan Kara <jack@suse.cz>

    Honza
    > ---
    > fs/xfs/xfs_aops.c | 26 +++++---------------------
    > fs/xfs/xfs_aops.h | 3 ---
    > fs/xfs/xfs_file.c | 2 +-
    > 3 files changed, 6 insertions(+), 25 deletions(-)
    >
    > diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
    > index 0e2a931..1c73d0a 100644
    > --- a/fs/xfs/xfs_aops.c
    > +++ b/fs/xfs/xfs_aops.c
    > @@ -1298,8 +1298,7 @@ __xfs_get_blocks(
    > sector_t iblock,
    > struct buffer_head *bh_result,
    > int create,
    > - bool direct,
    > - bool dax_fault)
    > + bool direct)
    > {
    > struct xfs_inode *ip = XFS_I(inode);
    > struct xfs_mount *mp = ip->i_mount;
    > @@ -1420,13 +1419,8 @@ __xfs_get_blocks(
    > if (ISUNWRITTEN(&imap))
    > set_buffer_unwritten(bh_result);
    > /* direct IO needs special help */
    > - if (create) {
    > - if (dax_fault)
    > - ASSERT(!ISUNWRITTEN(&imap));
    > - else
    > - xfs_map_direct(inode, bh_result, &imap, offset,
    > - is_cow);
    > - }
    > + if (create)
    > + xfs_map_direct(inode, bh_result, &imap, offset, is_cow);
    > }
    >
    > /*
    > @@ -1466,7 +1460,7 @@ xfs_get_blocks(
    > struct buffer_head *bh_result,
    > int create)
    > {
    > - return __xfs_get_blocks(inode, iblock, bh_result, create, false, false);
    > + return __xfs_get_blocks(inode, iblock, bh_result, create, false);
    > }
    >
    > int
    > @@ -1476,17 +1470,7 @@ xfs_get_blocks_direct(
    > struct buffer_head *bh_result,
    > int create)
    > {
    > - return __xfs_get_blocks(inode, iblock, bh_result, create, true, false);
    > -}
    > -
    > -int
    > -xfs_get_blocks_dax_fault(
    > - struct inode *inode,
    > - sector_t iblock,
    > - struct buffer_head *bh_result,
    > - int create)
    > -{
    > - return __xfs_get_blocks(inode, iblock, bh_result, create, true, true);
    > + return __xfs_get_blocks(inode, iblock, bh_result, create, true);
    > }
    >
    > /*
    > diff --git a/fs/xfs/xfs_aops.h b/fs/xfs/xfs_aops.h
    > index b3c6634..34dc00d 100644
    > --- a/fs/xfs/xfs_aops.h
    > +++ b/fs/xfs/xfs_aops.h
    > @@ -59,9 +59,6 @@ int xfs_get_blocks(struct inode *inode, sector_t offset,
    > struct buffer_head *map_bh, int create);
    > int xfs_get_blocks_direct(struct inode *inode, sector_t offset,
    > struct buffer_head *map_bh, int create);
    > -int xfs_get_blocks_dax_fault(struct inode *inode, sector_t offset,
    > - struct buffer_head *map_bh, int create);
    > -
    > int xfs_end_io_direct_write(struct kiocb *iocb, loff_t offset,
    > ssize_t size, void *private);
    > int xfs_setfilesize(struct xfs_inode *ip, xfs_off_t offset, size_t size);
    > diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
    > index 8f12152..7b13dda 100644
    > --- a/fs/xfs/xfs_file.c
    > +++ b/fs/xfs/xfs_file.c
    > @@ -1750,7 +1750,7 @@ xfs_filemap_pmd_fault(
    > }
    >
    > xfs_ilock(XFS_I(inode), XFS_MMAPLOCK_SHARED);
    > - ret = dax_pmd_fault(vma, addr, pmd, flags, xfs_get_blocks_dax_fault);
    > + ret = dax_iomap_pmd_fault(vma, addr, pmd, flags, &xfs_iomap_ops);
    > xfs_iunlock(XFS_I(inode), XFS_MMAPLOCK_SHARED);
    >
    > if (flags & FAULT_FLAG_WRITE)
    > --
    > 2.7.4
    >
    >
    --
    Jan Kara <jack@suse.com>
    SUSE Labs, CR

    \
     
     \ /
      Last update: 2016-10-11 20:44    [W:3.087 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site