Commit c421df0b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christian Brauner
Browse files

xfs: clean up FS_XFLAG_REALTIME handling in xfs_ioctl_setattr_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: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20231025141020.192413-4-hch@lst.de


Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 1898efcd

fs/xfs/xfs_ioctl.c

+12 −10
Original line number Diff line number Diff line
@@ -1121,23 +1121,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;



	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) &&

	    XFS_IS_REALTIME_INODE(ip) != (fa->fsx_xflags & FS_XFLAG_REALTIME))

		if (ip->i_df.if_nextents || ip->i_delayed_blks)

			return -EINVAL;

	}



	if (rtflag) {

		/* If realtime flag is set then must have realtime device */

	if (fa->fsx_xflags & FS_XFLAG_REALTIME) {

		if (mp->m_sb.sb_rblocks == 0 || mp->m_sb.sb_rextsize == 0 ||

		    xfs_extlen_to_rtxmod(mp, ip->i_extsize))

			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))

		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);