From: Darrick J. Wong <djwong@kernel.org>
Date: Tue, 12 Jul 2022 18:28:33 +0000 (-0500)
Subject: mkfs: preserve DIFLAG2_NREXT64 when setting other inode attributes
X-Git-Tag: v5.19.0-rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6fd10341170378b571d2de0e73c870f8b8697c0;p=thirdparty%2Fxfsprogs-dev.git

mkfs: preserve DIFLAG2_NREXT64 when setting other inode attributes

Preserve the state of the NREXT64 inode flag when we're changing the
other flags2 fields.  This is only vital for the kernel version of this
function, but we should keep these in sync.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/libxfs/util.c b/libxfs/util.c
index ef01fcf85..d2389198c 100644
--- a/libxfs/util.c
+++ b/libxfs/util.c
@@ -198,7 +198,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;