lkml.org 
[lkml]   [2021]   [Mar]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 10/10] fs/xfs: Add dedupe support for fsdax
    Date
    Add xfs_break_two_dax_layouts() to break layout for tow dax files.  Then
    call compare range function only when files are both DAX or not.

    Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
    ---
    fs/xfs/xfs_file.c | 20 ++++++++++++++++++++
    fs/xfs/xfs_inode.c | 8 +++++++-
    fs/xfs/xfs_inode.h | 1 +
    fs/xfs/xfs_reflink.c | 5 +++--
    4 files changed, 31 insertions(+), 3 deletions(-)

    diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
    index 1987d15eab61..82467d08e3ce 100644
    --- a/fs/xfs/xfs_file.c
    +++ b/fs/xfs/xfs_file.c
    @@ -784,6 +784,26 @@ xfs_break_dax_layouts(
    0, 0, xfs_wait_dax_page(inode));
    }

    +int
    +xfs_break_two_dax_layouts(
    + struct inode *src,
    + struct inode *dest)
    +{
    + int error;
    + bool retry = false;
    +
    +retry:
    + error = xfs_break_dax_layouts(src, &retry);
    + if (error || retry)
    + goto retry;
    +
    + error = xfs_break_dax_layouts(dest, &retry);
    + if (error || retry)
    + goto retry;
    +
    + return error;
    +}
    +
    int
    xfs_break_layouts(
    struct inode *inode,
    diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
    index b7352bc4c815..c11b11e59a83 100644
    --- a/fs/xfs/xfs_inode.c
    +++ b/fs/xfs/xfs_inode.c
    @@ -3651,8 +3651,10 @@ xfs_ilock2_io_mmap(
    struct xfs_inode *ip2)
    {
    int ret;
    + struct inode *inode1 = VFS_I(ip1);
    + struct inode *inode2 = VFS_I(ip2);

    - ret = xfs_iolock_two_inodes_and_break_layout(VFS_I(ip1), VFS_I(ip2));
    + ret = xfs_iolock_two_inodes_and_break_layout(inode1, inode2);
    if (ret)
    return ret;
    if (ip1 == ip2)
    @@ -3660,6 +3662,10 @@ xfs_ilock2_io_mmap(
    else
    xfs_lock_two_inodes(ip1, XFS_MMAPLOCK_EXCL,
    ip2, XFS_MMAPLOCK_EXCL);
    +
    + if (IS_DAX(inode1) && IS_DAX(inode2))
    + ret = xfs_break_two_dax_layouts(inode1, inode2);
    +
    return 0;
    }

    diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
    index eca333f5f715..9ed7a2895602 100644
    --- a/fs/xfs/xfs_inode.h
    +++ b/fs/xfs/xfs_inode.h
    @@ -431,6 +431,7 @@ enum xfs_prealloc_flags {

    int xfs_update_prealloc_flags(struct xfs_inode *ip,
    enum xfs_prealloc_flags flags);
    +int xfs_break_two_dax_layouts(struct inode *inode1, struct inode *inode2);
    int xfs_break_layouts(struct inode *inode, uint *iolock,
    enum layout_break_reason reason);

    diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
    index 73c556c2ff76..e62b00c2a0c8 100644
    --- a/fs/xfs/xfs_reflink.c
    +++ b/fs/xfs/xfs_reflink.c
    @@ -29,6 +29,7 @@
    #include "xfs_iomap.h"
    #include "xfs_sb.h"
    #include "xfs_ag_resv.h"
    +#include <linux/dax.h>

    /*
    * Copy on Write of Shared Blocks
    @@ -1303,8 +1304,8 @@ xfs_reflink_remap_prep(
    if (XFS_IS_REALTIME_INODE(src) || XFS_IS_REALTIME_INODE(dest))
    goto out_unlock;

    - /* Don't share DAX file data for now. */
    - if (IS_DAX(inode_in) || IS_DAX(inode_out))
    + /* Don't share DAX file data with non-DAX file. */
    + if (IS_DAX(inode_in) != IS_DAX(inode_out))
    goto out_unlock;

    if (IS_DAX(inode_in))
    --
    2.30.1


    \
     
     \ /
      Last update: 2021-03-19 02:54    [W:3.392 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site