| Message ID | 20231025141020.192413-4-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] filemap: add a per-mapping stable writes flag | expand |
On Wed, Oct 25, 2023 at 04:10:19PM +0200, Christoph Hellwig wrote: > Introduce a local boolean variable if FS_XFLAG_REALTIME to make the > checks for it more obvious, and de-densify a few of the conditionals > using it to make them more readable while at it. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks ok, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > fs/xfs/xfs_ioctl.c | 22 ++++++++++++---------- > 1 file changed, 12 insertions(+), 10 deletions(-) > > diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c > index 55bb01173cde8c..be69e7be713e5c 100644 > --- a/fs/xfs/xfs_ioctl.c > +++ b/fs/xfs/xfs_ioctl.c > @@ -1120,23 +1120,25 @@ xfs_ioctl_setattr_xflags( > struct fileattr *fa) > { > struct xfs_mount *mp = ip->i_mount; > + bool rtflag = (fa->fsx_xflags & FS_XFLAG_REALTIME); > uint64_t i_flags2; > > - /* Can't change realtime flag if any extents are allocated. */ > - if ((ip->i_df.if_nextents || ip->i_delayed_blks) && > - XFS_IS_REALTIME_INODE(ip) != (fa->fsx_xflags & FS_XFLAG_REALTIME)) > - return -EINVAL; > + if (rtflag != XFS_IS_REALTIME_INODE(ip)) { > + /* Can't change realtime flag if any extents are allocated. */ > + if (ip->i_df.if_nextents || ip->i_delayed_blks) > + return -EINVAL; > + } > > - /* If realtime flag is set then must have realtime device */ > - if (fa->fsx_xflags & FS_XFLAG_REALTIME) { > + if (rtflag) { > + /* If realtime flag is set then must have realtime device */ > if (mp->m_sb.sb_rblocks == 0 || mp->m_sb.sb_rextsize == 0 || > (ip->i_extsize % mp->m_sb.sb_rextsize)) > return -EINVAL; > - } > > - /* Clear reflink if we are actually able to set the rt flag. */ > - if ((fa->fsx_xflags & FS_XFLAG_REALTIME) && xfs_is_reflink_inode(ip)) > - ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK; > + /* Clear reflink if we are actually able to set the rt flag. */ > + if (xfs_is_reflink_inode(ip)) > + ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK; > + } > > /* diflags2 only valid for v3 inodes. */ > i_flags2 = xfs_flags2diflags2(ip, fa->fsx_xflags); > -- > 2.39.2 >
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 55bb01173cde8c..be69e7be713e5c 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -1120,23 +1120,25 @@ xfs_ioctl_setattr_xflags( struct fileattr *fa) { struct xfs_mount *mp = ip->i_mount; + bool rtflag = (fa->fsx_xflags & FS_XFLAG_REALTIME); uint64_t i_flags2; - /* Can't change realtime flag if any extents are allocated. */ - if ((ip->i_df.if_nextents || ip->i_delayed_blks) && - XFS_IS_REALTIME_INODE(ip) != (fa->fsx_xflags & FS_XFLAG_REALTIME)) - return -EINVAL; + if (rtflag != XFS_IS_REALTIME_INODE(ip)) { + /* Can't change realtime flag if any extents are allocated. */ + if (ip->i_df.if_nextents || ip->i_delayed_blks) + return -EINVAL; + } - /* If realtime flag is set then must have realtime device */ - if (fa->fsx_xflags & FS_XFLAG_REALTIME) { + if (rtflag) { + /* If realtime flag is set then must have realtime device */ if (mp->m_sb.sb_rblocks == 0 || mp->m_sb.sb_rextsize == 0 || (ip->i_extsize % mp->m_sb.sb_rextsize)) return -EINVAL; - } - /* Clear reflink if we are actually able to set the rt flag. */ - if ((fa->fsx_xflags & FS_XFLAG_REALTIME) && xfs_is_reflink_inode(ip)) - ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK; + /* Clear reflink if we are actually able to set the rt flag. */ + if (xfs_is_reflink_inode(ip)) + ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK; + } /* diflags2 only valid for v3 inodes. */ i_flags2 = xfs_flags2diflags2(ip, fa->fsx_xflags);
Introduce a local boolean variable if FS_XFLAG_REALTIME to make the checks for it more obvious, and de-densify a few of the conditionals using it to make them more readable while at it. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/xfs_ioctl.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)