All of lore.kernel.org
 help / color / mirror / Atom feed
From: Catherine Hoang <catherine.hoang@oracle.com>
To: stable@vger.kernel.org
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 6.6 20/21] xfs: clean up FS_XFLAG_REALTIME handling in xfs_ioctl_setattr_xflags
Date: Thu,  8 Feb 2024 15:20:53 -0800	[thread overview]
Message-ID: <20240208232054.15778-21-catherine.hoang@oracle.com> (raw)
In-Reply-To: <20240208232054.15778-1-catherine.hoang@oracle.com>

From: Christoph Hellwig <hch@lst.de>

commit c421df0b19430417a04f68919fc3d1943d20ac04 upstream.

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>
Link: https://lore.kernel.org/r/20231025141020.192413-4-hch@lst.de
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Catherine Hoang <catherine.hoang@oracle.com>
Acked-by: Chandan Babu R <chandanbabu@kernel.org>
---
 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 55bb01173cde..be69e7be713e 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.3


  parent reply	other threads:[~2024-02-08 23:21 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-08 23:20 [PATCH 6.6 00/21] xfs backports for 6.6.y (from v6.7) Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 01/21] MAINTAINERS: add Catherine as xfs maintainer for 6.6.y Catherine Hoang
2024-02-08 23:40   ` kernel test robot
2024-02-08 23:20 ` [PATCH 6.6 02/21] xfs: bump max fsgeom struct version Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 03/21] xfs: hoist freeing of rt data fork extent mappings Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 04/21] xfs: prevent rt growfs when quota is enabled Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 05/21] xfs: rt stubs should return negative errnos when rt disabled Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 06/21] xfs: fix units conversion error in xfs_bmap_del_extent_delay Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 07/21] xfs: make sure maxlen is still congruent with prod when rounding down Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 08/21] xfs: introduce protection for drop nlink Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 09/21] xfs: handle nimaps=0 from xfs_bmapi_write in xfs_alloc_file_space Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 10/21] xfs: allow read IO and FICLONE to run concurrently Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 11/21] xfs: factor out xfs_defer_pending_abort Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 12/21] xfs: abort intent items when recovery intents fail Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 13/21] xfs: only remap the written blocks in xfs_reflink_end_cow_extent Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 14/21] xfs: up(ic_sema) if flushing data device fails Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 15/21] xfs: fix internal error from AGFL exhaustion Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 16/21] xfs: fix again select in kconfig XFS_ONLINE_SCRUB_STATS Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 17/21] xfs: inode recovery does not validate the recovered inode Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 18/21] xfs: clean up dqblk extraction Catherine Hoang
2024-02-08 23:20 ` [PATCH 6.6 19/21] xfs: dquot recovery does not validate the recovered dquot Catherine Hoang
2024-02-08 23:20 ` Catherine Hoang [this message]
2024-02-08 23:20 ` [PATCH 6.6 21/21] xfs: respect the stable writes flag on the RT device Catherine Hoang
2024-02-09 18:44 ` [PATCH 6.6 00/21] xfs backports for 6.6.y (from v6.7) Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240208232054.15778-21-catherine.hoang@oracle.com \
    --to=catherine.hoang@oracle.com \
    --cc=linux-xfs@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.