Message ID | 165463579982.417102.16435790324978634359.stgit@magnolia (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Series | xfs: random fixes for 5.19-rc2 | expand |
On Tue, 2022-06-07 at 14:03 -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@kernel.org> > > It is vitally important that we preserve the state of the NREXT64 > inode > flag when we're changing the other flags2 fields. > > Fixes: 9b7d16e34bbe ("xfs: Introduce XFS_DIFLAG2_NREXT64 and > associated helpers") > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > Reviewed-by: Dave Chinner <dchinner@redhat.com> > Reviewed-by: Chandan Babu R <chandan.babu@oracle.com> Reviewed-by: Allison Henderson <allison.henderson@oracle.com> > --- > fs/xfs/xfs_ioctl.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > > diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c > index 5a364a7d58fd..0d67ff8a8961 100644 > --- a/fs/xfs/xfs_ioctl.c > +++ b/fs/xfs/xfs_ioctl.c > @@ -1096,7 +1096,8 @@ xfs_flags2diflags2( > { > uint64_t di_flags2 = > (ip->i_diflags2 & (XFS_DIFLAG2_REFLINK | > - XFS_DIFLAG2_BIGTIME)); > + XFS_DIFLAG2_BIGTIME | > + XFS_DIFLAG2_NREXT64)); > > if (xflags & FS_XFLAG_DAX) > di_flags2 |= XFS_DIFLAG2_DAX; >
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 5a364a7d58fd..0d67ff8a8961 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -1096,7 +1096,8 @@ xfs_flags2diflags2( { uint64_t di_flags2 = (ip->i_diflags2 & (XFS_DIFLAG2_REFLINK | - XFS_DIFLAG2_BIGTIME)); + XFS_DIFLAG2_BIGTIME | + XFS_DIFLAG2_NREXT64)); if (xflags & FS_XFLAG_DAX) di_flags2 |= XFS_DIFLAG2_DAX;