From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH] xfs: don't set v3 xflags for v2 inodes
Date: Sat, 2 Sep 2017 08:22:48 -0700 [thread overview]
Message-ID: <20170902152248.GB4073@magnolia> (raw)
In-Reply-To: <20170901205002.2194-1-hch@lst.de>
On Fri, Sep 01, 2017 at 10:50:02PM +0200, Christoph Hellwig wrote:
> Reject attempts to set XFLAGS that correspond to di_flags2 inode flags
> if the inode isn't a v3 inode, because di_flags2 only exists on v3.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/xfs_ioctl.c | 38 +++++++++++++++++++++++++-------------
> 1 file changed, 25 insertions(+), 13 deletions(-)
>
> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index 06ca244c323a..5049e8ab6e30 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -931,16 +931,15 @@ xfs_ioc_fsgetxattr(
> return 0;
> }
>
> -STATIC void
> -xfs_set_diflags(
> +STATIC uint16_t
> +xfs_flags2diflags(
> struct xfs_inode *ip,
> unsigned int xflags)
> {
> - unsigned int di_flags;
> - uint64_t di_flags2;
> -
> /* can't set PREALLOC this way, just preserve it */
> - di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC);
> + uint16_t di_flags =
> + (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC);
> +
> if (xflags & FS_XFLAG_IMMUTABLE)
> di_flags |= XFS_DIFLAG_IMMUTABLE;
> if (xflags & FS_XFLAG_APPEND)
> @@ -970,19 +969,24 @@ xfs_set_diflags(
> if (xflags & FS_XFLAG_EXTSIZE)
> di_flags |= XFS_DIFLAG_EXTSIZE;
> }
> - ip->i_d.di_flags = di_flags;
>
> - /* diflags2 only valid for v3 inodes. */
> - if (ip->i_d.di_version < 3)
> - return;
> + return di_flags;
> +}
> +
> +STATIC uint64_t
> +xfs_flags2diflags2(
> + struct xfs_inode *ip,
> + unsigned int xflags)
> +{
> + uint64_t di_flags2 =
> + (ip->i_d.di_flags2 & XFS_DIFLAG2_REFLINK);
>
> - di_flags2 = (ip->i_d.di_flags2 & XFS_DIFLAG2_REFLINK);
> if (xflags & FS_XFLAG_DAX)
> di_flags2 |= XFS_DIFLAG2_DAX;
> if (xflags & FS_XFLAG_COWEXTSIZE)
> di_flags2 |= XFS_DIFLAG2_COWEXTSIZE;
>
> - ip->i_d.di_flags2 = di_flags2;
> + return di_flags2;
> }
>
> STATIC void
> @@ -1023,6 +1027,7 @@ xfs_ioctl_setattr_xflags(
> struct fsxattr *fa)
> {
> struct xfs_mount *mp = ip->i_mount;
> + uint64_t di_flags2;
>
> /* Can't change realtime flag if any extents are allocated. */
> if ((ip->i_d.di_nextents || ip->i_delayed_blks) &&
> @@ -1053,7 +1058,14 @@ xfs_ioctl_setattr_xflags(
> !capable(CAP_LINUX_IMMUTABLE))
> return -EPERM;
>
> - xfs_set_diflags(ip, fa->fsx_xflags);
> + /* diflags2 only valid for v3 inodes. */
> + di_flags2 = xfs_flags2diflags2(ip, fa->fsx_xflags);
> + if (di_flags2 && ip->i_d.di_version < 3)
> + return -EINVAL;
> +
> + ip->i_d.di_flags = xfs_flags2diflags(ip, fa->fsx_xflags);
> + ip->i_d.di_flags2 = di_flags2;
> +
> xfs_diflags_to_linux(ip);
> xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG);
> xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
> --
> 2.11.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2017-09-02 15:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-01 20:50 [PATCH] xfs: don't set v3 xflags for v2 inodes Christoph Hellwig
2017-09-02 15:22 ` Darrick J. Wong [this message]
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=20170902152248.GB4073@magnolia \
--to=darrick.wong@oracle.com \
--cc=hch@lst.de \
--cc=linux-xfs@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox