[1/8] remove support for ext4dev

Commit Message

Christoph Hellwig June 23, 2024, 12:10 p.m. UTC

ext4dev is a long deprecated alias for ext4 that was used during early
ext4 development.  Drop support for it.

Signed-off-by: Christoph Hellwig <[e-mail]>
---
 common/config     | 6 +++---
 common/defrag     | 2 +-
 common/quota      | 4 ++--
 common/rc         | 8 ++++----
 tests/generic/740 | 1 -
 5 files changed, 10 insertions(+), 11 deletions(-)

Patch

diff --git a/common/config b/common/config
index a1cd14de6..22740c0af 100644
--- a/common/config
+++ b/common/config
@@ -361,7 +361,7 @@  _common_mount_opts()
 	overlay)
 		echo $OVERLAY_MOUNT_OPTIONS
 		;;
-	ext2|ext3|ext4|ext4dev)
+	ext2|ext3|ext4)
 		# acls & xattrs aren't turned on by default on ext$FOO
 		echo "-o acl,user_xattr $EXT_MOUNT_OPTIONS"
 		;;
@@ -454,7 +454,7 @@  _mkfs_opts()
 _fsck_opts()
 {
 	case $FSTYP in
-	ext2|ext3|ext4|ext4dev)
+	ext2|ext3|ext4)
 		export FSCK_OPTIONS="-nf"
 		;;
 	reiser*)
@@ -500,7 +500,7 @@  _source_specific_fs()
 		[ "$MKFS_EXT4_PROG" = "" ] && _fatal "mkfs.ext4 not found"
 		. ./common/ext4
 		;;
-	ext2|ext3|ext4dev)
+	ext2|ext3)
 		. ./common/ext4
 		;;
 	f2fs)
diff --git a/common/defrag b/common/defrag
index 1381a4dd3..055d0d0e9 100644
--- a/common/defrag
+++ b/common/defrag
@@ -12,7 +12,7 @@  _require_defrag()
         _require_xfs_io_command "falloc"
         DEFRAG_PROG="$XFS_FSR_PROG"
 	;;
-    ext4|ext4dev)
+    ext4)
 	testfile="$TEST_DIR/$$-test.defrag"
 	donorfile="$TEST_DIR/$$-donor.defrag"
 	bsize=`_get_block_size $TEST_DIR`
diff --git a/common/quota b/common/quota
index 4c1d3dcd7..3bf7d552e 100644
--- a/common/quota
+++ b/common/quota
@@ -12,7 +12,7 @@  _require_quota()
     [ -n "$QUOTA_PROG" ] || _notrun "Quota user tools not installed"
 
     case $FSTYP in
-    ext2|ext3|ext4|ext4dev|f2fs|reiserfs)
+    ext2|ext3|ext4|f2fs|reiserfs)
 	if [ ! -d /proc/sys/fs/quota ]; then
 	    _notrun "Installed kernel does not support quotas"
 	fi
@@ -344,7 +344,7 @@  _check_quota_usage()
 
 	VFS_QUOTA=0
 	case $FSTYP in
-	ext2|ext3|ext4|ext4dev|f2fs|reiserfs|gfs2|bcachefs)
+	ext2|ext3|ext4|f2fs|reiserfs|gfs2|bcachefs)
 		VFS_QUOTA=1
 		quotaon -f -u -g $SCRATCH_MNT 2>/dev/null
 		;;
diff --git a/common/rc b/common/rc
index 7100373cb..afc33bbc2 100644
--- a/common/rc
+++ b/common/rc
@@ -240,7 +240,7 @@  _scratch_options()
     "xfs")
 	_scratch_xfs_options "$@"
 	;;
-    ext2|ext3|ext4|ext4dev)
+    ext2|ext3|ext4)
 	_scratch_ext4_options "$@"
 	;;
     esac
@@ -1038,7 +1038,7 @@  _try_scratch_mkfs_sized()
 	btrfs)
 		def_blksz=`echo $MKFS_OPTIONS | sed -rn 's/.*-s ?+([0-9]+).*/\1/p'`
 		;;
-	ext2|ext3|ext4|ext4dev|reiser4|ocfs2|reiserfs)
+	ext2|ext3|ext4|reiser4|ocfs2|reiserfs)
 		def_blksz=`echo $MKFS_OPTIONS | sed -rn 's/.*-b ?+([0-9]+).*/\1/p'`
 		;;
 	udf)
@@ -1095,7 +1095,7 @@  _try_scratch_mkfs_sized()
 			_scratch_mkfs_xfs -d size=$fssize $rt_ops -b size=$blocksize
 		fi
 		;;
-	ext2|ext3|ext4|ext4dev)
+	ext2|ext3|ext4)
 		# Can't use _scratch_mkfs_ext4 here because the block count has
 		# to come after the device path.
 		if [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ]; then
@@ -1199,7 +1199,7 @@  _scratch_mkfs_geom()
 		MKFS_OPTIONS+=" -d su=$sunit_bytes,sw=$swidth_mult"
 	fi
 	;;
-    ext4|ext4dev)
+    ext4)
 	MKFS_OPTIONS+=" -b $blocksize -E stride=$sunit_blocks,stripe_width=$swidth_blocks"
 	;;
     *)
diff --git a/tests/generic/740 b/tests/generic/740
index 6ed248617..3deba86b3 100755
--- a/tests/generic/740
+++ b/tests/generic/740
@@ -48,7 +48,6 @@  do
 	[ $fs = ext2 ] && preargs="-F"
 	[ $fs = ext3 ] && preargs="-F"
 	[ $fs = ext4 ] && preargs="-F"
-	[ $fs = ext4dev ] && preargs="-F"
 	# jffs2 mkfs requires '-r $directory' and '-o $image'
 	[ $fs = jffs2 ] && preargs="-r /proc/fs -o"