mkfs: pass a custom cowextsize into the created filesystem

Create a -d option to mkfs.xfs that enables administrators to set the CoW extent size hint on the created files.

Signed-off-by Darrick J. Wong <[email protected]>

---
 libxfs/util.c       |   26 ++++++++++++++++++++++++--
 man/man8/mkfs.xfs.8 |    7 +++++++
 mkfs/xfs_mkfs.c     |   20 ++++++++++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)

libxfs/util.c +0 -0

index 0e2f29e..4f82d7f 100644

Quoted 15 lines · Darrick J. Wong

Create a -d option to mkfs.xfs that enables administrators to set the CoW extent size hint on the created files.

Signed-off-by Darrick J. Wong <[email protected]>

---
 libxfs/util.c       |   26 ++++++++++++++++++++++++--
 man/man8/mkfs.xfs.8 |    7 +++++++
 mkfs/xfs_mkfs.c     |   20 ++++++++++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)

libxfs/util.c +0 -0

index 0e2f29e..4f82d7f 100644

libxfs/util.c libxfs_trans_ichgtime( · line 183

Quoted 9 lines

libxfs/util.c +6 -0

@@ -175,6 +175,26 @@ libxfs_trans_ichgtime(
 	}
 }
 
+static inline uint16_t
+xflags_to_diflags(
+	__u32		xflags)
+{
+	/* bottom 15 xflag bits correspond to diflag bits */
+	return xflags & 0x7FFF;

Do we really want to rely on that fact?

libxfs/util.c libxfs_trans_ichgtime( · line 196

Quoted 13 lines

libxfs/util.c +13 -0

+}
+
+static inline uint64_t
+xflags_to_diflags2(
+	__u32		xflags)
+{
+	uint64_t	ret = 0;
+
+	if (xflags & FS_XFLAG_COWEXTSIZE)
+		ret |= XFS_DIFLAG2_COWEXTSIZE;
+
+	return ret;
+}

It seems like we should just lift the kernels xfs_flags2diflags and xfs_flags2diflags2 to libxfs and use them here?

--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Create a -d option to mkfs.xfs that enables administrators to set the CoW extent size hint on the created files.

Signed-off-by Darrick J. Wong <[email protected]>

---
v2: port flags2diflags from the kernel

---
 libxfs/util.c       |   64 +++++++++++++++++++++++++++++++++++++++++++++++++--
 man/man8/mkfs.xfs.8 |    7 ++++++
 mkfs/xfs_mkfs.c     |   20 ++++++++++++++++
 3 files changed, 89 insertions(+), 2 deletions(-)

libxfs/util.c +58 -0

index 0e2f29e..b600594 100644
@@ -175,6 +175,64 @@ libxfs_trans_ichgtime(
 	}
 }
 
+STATIC uint16_t
+xfs_flags2diflags(
+	struct xfs_inode	*ip,
+	unsigned int		xflags)
+{
+	/* can't set PREALLOC this way, just preserve it */
+	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)
+		di_flags |= XFS_DIFLAG_APPEND;
+	if (xflags & FS_XFLAG_SYNC)
+		di_flags |= XFS_DIFLAG_SYNC;
+	if (xflags & FS_XFLAG_NOATIME)
+		di_flags |= XFS_DIFLAG_NOATIME;
+	if (xflags & FS_XFLAG_NODUMP)
+		di_flags |= XFS_DIFLAG_NODUMP;
+	if (xflags & FS_XFLAG_NODEFRAG)
+		di_flags |= XFS_DIFLAG_NODEFRAG;
+	if (xflags & FS_XFLAG_FILESTREAM)
+		di_flags |= XFS_DIFLAG_FILESTREAM;
+	if (S_ISDIR(VFS_I(ip)->i_mode)) {
+		if (xflags & FS_XFLAG_RTINHERIT)
+			di_flags |= XFS_DIFLAG_RTINHERIT;
+		if (xflags & FS_XFLAG_NOSYMLINKS)
+			di_flags |= XFS_DIFLAG_NOSYMLINKS;
+		if (xflags & FS_XFLAG_EXTSZINHERIT)
+			di_flags |= XFS_DIFLAG_EXTSZINHERIT;
+		if (xflags & FS_XFLAG_PROJINHERIT)
+			di_flags |= XFS_DIFLAG_PROJINHERIT;
+	} else if (S_ISREG(VFS_I(ip)->i_mode)) {
+		if (xflags & FS_XFLAG_REALTIME)
+			di_flags |= XFS_DIFLAG_REALTIME;
+		if (xflags & FS_XFLAG_EXTSIZE)
+			di_flags |= XFS_DIFLAG_EXTSIZE;
+	}
+
+	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);
+
+	if (xflags & FS_XFLAG_DAX)
+		di_flags2 |= XFS_DIFLAG2_DAX;
+	if (xflags & FS_XFLAG_COWEXTSIZE)
+		di_flags2 |= XFS_DIFLAG2_COWEXTSIZE;
+
+	return di_flags2;
+}
+
 /*
  * Allocate an inode on disk and return a copy of its in-core version.
  * Set mode, nlink, and rdev appropriately within the inode.

Quoted 6 lines · Darrick J. Wong

Create a -d option to mkfs.xfs that enables administrators to set the CoW extent size hint on the created files.

Signed-off-by Darrick J. Wong <[email protected]>

---
v2: port flags2diflags from the kernel

hm, I wonder if we need a libxfs/util.c in the kernel for stuff like this so libxfs diff will keep such things in sync in the future.

a project for another day I guess. One question below.

Quoted 75 lines

---
 libxfs/util.c       |   64 +++++++++++++++++++++++++++++++++++++++++++++++++--
 man/man8/mkfs.xfs.8 |    7 ++++++
 mkfs/xfs_mkfs.c     |   20 ++++++++++++++++
 3 files changed, 89 insertions(+), 2 deletions(-)

libxfs/util.c +58 -0

index 0e2f29e..b600594 100644
@@ -175,6 +175,64 @@ libxfs_trans_ichgtime(
 	}
 }
 
+STATIC uint16_t
+xfs_flags2diflags(
+	struct xfs_inode	*ip,
+	unsigned int		xflags)
+{
+	/* can't set PREALLOC this way, just preserve it */
+	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)
+		di_flags |= XFS_DIFLAG_APPEND;
+	if (xflags & FS_XFLAG_SYNC)
+		di_flags |= XFS_DIFLAG_SYNC;
+	if (xflags & FS_XFLAG_NOATIME)
+		di_flags |= XFS_DIFLAG_NOATIME;
+	if (xflags & FS_XFLAG_NODUMP)
+		di_flags |= XFS_DIFLAG_NODUMP;
+	if (xflags & FS_XFLAG_NODEFRAG)
+		di_flags |= XFS_DIFLAG_NODEFRAG;
+	if (xflags & FS_XFLAG_FILESTREAM)
+		di_flags |= XFS_DIFLAG_FILESTREAM;
+	if (S_ISDIR(VFS_I(ip)->i_mode)) {
+		if (xflags & FS_XFLAG_RTINHERIT)
+			di_flags |= XFS_DIFLAG_RTINHERIT;
+		if (xflags & FS_XFLAG_NOSYMLINKS)
+			di_flags |= XFS_DIFLAG_NOSYMLINKS;
+		if (xflags & FS_XFLAG_EXTSZINHERIT)
+			di_flags |= XFS_DIFLAG_EXTSZINHERIT;
+		if (xflags & FS_XFLAG_PROJINHERIT)
+			di_flags |= XFS_DIFLAG_PROJINHERIT;
+	} else if (S_ISREG(VFS_I(ip)->i_mode)) {
+		if (xflags & FS_XFLAG_REALTIME)
+			di_flags |= XFS_DIFLAG_REALTIME;
+		if (xflags & FS_XFLAG_EXTSIZE)
+			di_flags |= XFS_DIFLAG_EXTSIZE;
+	}
+
+	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);
+
+	if (xflags & FS_XFLAG_DAX)
+		di_flags2 |= XFS_DIFLAG2_DAX;
+	if (xflags & FS_XFLAG_COWEXTSIZE)
+		di_flags2 |= XFS_DIFLAG2_COWEXTSIZE;
+
+	return di_flags2;
+}
+
 /*
  * Allocate an inode on disk and return a copy of its in-core version.
  * Set mode, nlink, and rdev appropriately within the inode.

libxfs/util.c libxfs_ialloc( · line 315

Quoted 6 lines

libxfs/util.c +1 -1

@@ -254,15 +312,17 @@ libxfs_ialloc(
 	ip->i_d.di_extsize = pip ? 0 : fsx->fsx_extsize;
 	ip->i_d.di_dmevmask = 0;
 	ip->i_d.di_dmstate = 0;
-	ip->i_d.di_flags = pip ? 0 : fsx->fsx_xflags;
+	ip->i_d.di_flags = pip ? 0 : xfs_flags2diflags(ip, fsx->fsx_xflags);

is this a bugfix?

The rest seems ok, just wondering if the above should be hidden in here - at least a mention of the change in the changelog seems needed, but most likely thjis is a separate change, no? Or am I missing something?

-Eric
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 7 lines

libxfs/util.c libxfs_ialloc( · line 315

Quoted 6 lines

libxfs/util.c +1 -1

@@ -254,15 +312,17 @@ libxfs_ialloc(
 	ip->i_d.di_extsize = pip ? 0 : fsx->fsx_extsize;
 	ip->i_d.di_dmevmask = 0;
 	ip->i_d.di_dmstate = 0;
-	ip->i_d.di_flags = pip ? 0 : fsx->fsx_xflags;
+	ip->i_d.di_flags = pip ? 0 : xfs_flags2diflags(ip, fsx->fsx_xflags);

is this a bugfix?

No.

Prior to this patch, the only fsx_xflags bits that mkfs could set are the ones that correspond exactly to di_flags bits, so it was fine to set them directly. Subtle and annoying, but it worked.

However, the xfs_mkfs.c changes enable us to set FS_XFLAG_COWEXTSIZE, which doesn't correspond to a di_flags bit, so now we need translation functions to return the correct di_flags/di_flags2 values for the given fsx_xflags.