summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarrick J. Wong <djwong@kernel.org>2022-06-03 16:26:39 -0700
committerDarrick J. Wong <djwong@kernel.org>2022-06-06 18:33:56 -0700
commit4f79ec3c42672bd274069220cac0a0ac1676815e (patch)
tree8d204254d9c34f8699b3f8e67a78b24fa7f64a90
parentbf31681a305a10e8bf7608fa1ee5b513ff5e48a2 (diff)
xfs: preserve DIFLAG2_NREXT64 when setting other inode attributesxfs-merge-5.19_2022-06-06
It is vitally important that we preserve the state of the NREXT64 inode flag when we're changing the other flags2 fields. Signed-off-by: Darrick J. Wong <djwong@kernel.org>
-rw-r--r--fs/xfs/xfs_ioctl.c3
1 files changed, 2 insertions, 1 deletions
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;