lkml.org 
[lkml]   [2020]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V6 6/8] fs/xfs: Combine xfs_diflags_to_linux() and xfs_diflags_to_iflags()
    Date
    From: Ira Weiny <ira.weiny@intel.com>

    The functionality in xfs_diflags_to_linux() and xfs_diflags_to_iflags() are
    nearly identical. The only difference is that *_to_linux() is called after
    inode setup and disallows changing the DAX flag.

    Combining them can be done with a flag which indicates if this is the initial
    setup to allow the DAX flag to be properly set only at init time.

    So remove xfs_diflags_to_linux() and call the modified xfs_diflags_to_iflags()
    directly.

    While we are here simplify xfs_diflags_to_iflags() to take struct xfs_inode and
    use xfs_ip2xflags() to ensure future diflags are included correctly.

    Signed-off-by: Ira Weiny <ira.weiny@intel.com>

    ---
    Changes from V5:
    The functions are no longer identical so we can only combine
    them rather than deleting one completely. This is reflected in
    the new init parameter.
    ---
    fs/xfs/xfs_inode.h | 1 +
    fs/xfs/xfs_ioctl.c | 33 +--------------------------------
    fs/xfs/xfs_iops.c | 42 +++++++++++++++++++++++++++---------------
    3 files changed, 29 insertions(+), 47 deletions(-)

    diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
    index 492e53992fa9..e76ed9ca17f7 100644
    --- a/fs/xfs/xfs_inode.h
    +++ b/fs/xfs/xfs_inode.h
    @@ -466,6 +466,7 @@ int xfs_break_layouts(struct inode *inode, uint *iolock,
    /* from xfs_iops.c */
    extern void xfs_setup_inode(struct xfs_inode *ip);
    extern void xfs_setup_iops(struct xfs_inode *ip);
    +extern void xfs_diflags_to_iflags(struct xfs_inode *ip, bool init);

    /*
    * When setting up a newly allocated inode, we need to call
    diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
    index d42de92cb283..c6cd92ef4a05 100644
    --- a/fs/xfs/xfs_ioctl.c
    +++ b/fs/xfs/xfs_ioctl.c
    @@ -1100,37 +1100,6 @@ xfs_flags2diflags2(
    return di_flags2;
    }

    -STATIC void
    -xfs_diflags_to_linux(
    - struct xfs_inode *ip)
    -{
    - struct inode *inode = VFS_I(ip);
    - unsigned int xflags = xfs_ip2xflags(ip);
    -
    - if (xflags & FS_XFLAG_IMMUTABLE)
    - inode->i_flags |= S_IMMUTABLE;
    - else
    - inode->i_flags &= ~S_IMMUTABLE;
    - if (xflags & FS_XFLAG_APPEND)
    - inode->i_flags |= S_APPEND;
    - else
    - inode->i_flags &= ~S_APPEND;
    - if (xflags & FS_XFLAG_SYNC)
    - inode->i_flags |= S_SYNC;
    - else
    - inode->i_flags &= ~S_SYNC;
    - if (xflags & FS_XFLAG_NOATIME)
    - inode->i_flags |= S_NOATIME;
    - else
    - inode->i_flags &= ~S_NOATIME;
    -#if 0 /* disabled until the flag switching races are sorted out */
    - if (xflags & FS_XFLAG_DAX)
    - inode->i_flags |= S_DAX;
    - else
    - inode->i_flags &= ~S_DAX;
    -#endif
    -}
    -
    static int
    xfs_ioctl_setattr_xflags(
    struct xfs_trans *tp,
    @@ -1168,7 +1137,7 @@ xfs_ioctl_setattr_xflags(
    ip->i_d.di_flags = xfs_flags2diflags(ip, fa->fsx_xflags);
    ip->i_d.di_flags2 = di_flags2;

    - xfs_diflags_to_linux(ip);
    + xfs_diflags_to_iflags(ip, false);
    xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG);
    xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
    XFS_STATS_INC(mp, xs_ig_attrchg);
    diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
    index e07f7b641226..a4ac8568c8c7 100644
    --- a/fs/xfs/xfs_iops.c
    +++ b/fs/xfs/xfs_iops.c
    @@ -1259,7 +1259,7 @@ xfs_inode_supports_dax(
    return xfs_inode_buftarg(ip)->bt_daxdev != NULL;
    }

    -STATIC bool
    +static bool
    xfs_inode_enable_dax(
    struct xfs_inode *ip)
    {
    @@ -1272,26 +1272,38 @@ xfs_inode_enable_dax(
    return false;
    }

    -STATIC void
    +void
    xfs_diflags_to_iflags(
    - struct inode *inode,
    - struct xfs_inode *ip)
    + struct xfs_inode *ip,
    + bool init)
    {
    - uint16_t flags = ip->i_d.di_flags;
    -
    - inode->i_flags &= ~(S_IMMUTABLE | S_APPEND | S_SYNC |
    - S_NOATIME | S_DAX);
    + struct inode *inode = VFS_I(ip);
    + uint diflags = xfs_ip2xflags(ip);

    - if (flags & XFS_DIFLAG_IMMUTABLE)
    + if (diflags & FS_XFLAG_IMMUTABLE)
    inode->i_flags |= S_IMMUTABLE;
    - if (flags & XFS_DIFLAG_APPEND)
    + else
    + inode->i_flags &= ~S_IMMUTABLE;
    + if (diflags & FS_XFLAG_APPEND)
    inode->i_flags |= S_APPEND;
    - if (flags & XFS_DIFLAG_SYNC)
    + else
    + inode->i_flags &= ~S_APPEND;
    + if (diflags & FS_XFLAG_SYNC)
    inode->i_flags |= S_SYNC;
    - if (flags & XFS_DIFLAG_NOATIME)
    + else
    + inode->i_flags &= ~S_SYNC;
    + if (diflags & FS_XFLAG_NOATIME)
    inode->i_flags |= S_NOATIME;
    - if (xfs_inode_enable_dax(ip))
    - inode->i_flags |= S_DAX;
    + else
    + inode->i_flags &= ~S_NOATIME;
    +
    + /* Only toggle the dax flag when initializing */
    + if (init) {
    + if (xfs_inode_enable_dax(ip))
    + inode->i_flags |= S_DAX;
    + else
    + inode->i_flags &= ~S_DAX;
    + }
    }

    /*
    @@ -1320,7 +1332,7 @@ xfs_setup_inode(
    inode->i_gid = xfs_gid_to_kgid(ip->i_d.di_gid);

    i_size_write(inode, ip->i_d.di_size);
    - xfs_diflags_to_iflags(inode, ip);
    + xfs_diflags_to_iflags(ip, true);

    if (S_ISDIR(inode->i_mode)) {
    /*
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-04-07 20:31    [W:4.131 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site