linux-ext4 - [PATCH 10/33] common/ext4: explicitly format with $FSTYP

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <176169820165.1433624.18204248404394943642.stgit@frogsfrogsfrogs>
Date: Tue, 28 Oct 2025 18:23:02 -0700
From: "Darrick J. Wong" <djwong@...nel.org>
To: djwong@...nel.org, zlang@...hat.com
Cc: neal@...pa.dev, fstests@...r.kernel.org, linux-ext4@...r.kernel.org,
 linux-fsdevel@...r.kernel.org, joannelkoong@...il.com, bernd@...ernd.com
Subject: [PATCH 10/33] common/ext4: explicitly format with $FSTYP

From: Darrick J. Wong <djwong@...nel.org>

Explicitly format with the given FSTYP so that if we're testing
fuse.ext4, we actually get the fuse-specific formatting options that
might be in the config file.

Signed-off-by: "Darrick J. Wong" <djwong@...nel.org>
---
 common/ext4 |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


diff --git a/common/ext4 b/common/ext4
index 69fcbc188dd066..ca7c9c95456692 100644
--- a/common/ext4
+++ b/common/ext4
@@ -74,7 +74,7 @@ _scratch_mkfs_ext4_opts()
 
 	_scratch_options mkfs
 
-	echo "$MKFS_EXT4_PROG $SCRATCH_OPTIONS $mkfs_opts"
+	echo "$MKFS_EXT4_PROG -t $FSTYP $SCRATCH_OPTIONS $mkfs_opts"
 }
 
 _scratch_mkfs_ext4()
@@ -85,7 +85,7 @@ _scratch_mkfs_ext4()
 	local mkfs_status
 
 	if [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ]; then
-		$MKFS_EXT4_PROG -F -O journal_dev $MKFS_OPTIONS $* $SCRATCH_LOGDEV 2>$tmp.mkfserr 1>$tmp.mkfsstd
+		$MKFS_EXT4_PROG -t $FSTYP -F -O journal_dev $MKFS_OPTIONS $* $SCRATCH_LOGDEV 2>$tmp.mkfserr 1>$tmp.mkfsstd
 		mkjournal_status=$?
 
 		if [ $mkjournal_status -ne 0 ]; then
@@ -158,7 +158,7 @@ _ext4_mdrestore()
 		local fsuuid="$($DUMPE2FS_PROG -h "${SCRATCH_DEV}" 2>/dev/null | \
 				grep 'Journal UUID:' | \
 				sed -e 's/Journal UUID:[[:space:]]*//g')"
-		$MKFS_EXT4_PROG -O journal_dev "${logdev}" \
+		$MKFS_EXT4_PROG -t $FSTYP -O journal_dev "${logdev}" \
 				-F -U "${fsuuid}"
 		res=$?
 	fi
@@ -195,7 +195,7 @@ _require_scratch_ext4_feature()
         echo "Usage: _require_scratch_ext4_feature feature"
         _exit 1
     fi
-    $MKFS_EXT4_PROG -F $MKFS_OPTIONS -O "$1" \
+    $MKFS_EXT4_PROG -t $FSTYP -F $MKFS_OPTIONS -O "$1" \
 		    $SCRATCH_DEV 512m >/dev/null 2>&1 \
 	|| _notrun "mkfs.ext4 doesn't support $1 feature"
     _try_scratch_mount >/dev/null 2>&1 \