From: "Darrick J. Wong" <djwong@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>,
Matthew Wilcox <willy@infradead.org>,
Ilya Dryomov <idryomov@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-xfs@vger.kernel.org, linux-mm@kvack.org
Subject: Re: [PATCH 3/4] xfs: clean up FS_XFLAG_REALTIME handling in xfs_ioctl_setattr_xflags
Date: Wed, 25 Oct 2023 07:39:43 -0700 [thread overview]
Message-ID: <20231025143943.GC3195650@frogsfrogsfrogs> (raw)
In-Reply-To: <20231025141020.192413-4-hch@lst.de>
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
>
next prev parent reply other threads:[~2023-10-25 14:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-25 14:10 add and use a per-mapping stable writes flag v2 Christoph Hellwig
2023-10-25 14:10 ` [PATCH 1/4] filemap: add a per-mapping stable writes flag Christoph Hellwig
2023-10-25 14:10 ` [PATCH 2/4] block: update the stable_writes flag in bdev_add Christoph Hellwig
2023-10-25 14:10 ` [PATCH 3/4] xfs: clean up FS_XFLAG_REALTIME handling in xfs_ioctl_setattr_xflags Christoph Hellwig
2023-10-25 14:39 ` Darrick J. Wong [this message]
2023-10-25 14:10 ` [PATCH 4/4] xfs: respect the stable writes flag on the RT device Christoph Hellwig
2023-10-25 14:40 ` Darrick J. Wong
2023-11-08 8:05 ` add and use a per-mapping stable writes flag v2 Christoph Hellwig
2023-11-08 16:25 ` Darrick J. Wong
2023-11-20 14:07 ` Christian Brauner
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=20231025143943.GC3195650@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=idryomov@gmail.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-xfs@vger.kernel.org \
--cc=willy@infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).