On Tue, Nov 14, 2017 at 06:38:49PM -0500, Theodore Ts'o wrote:
>
> Sure. How about simply including _require_scratch into the function?
Nope, that won't work, since we need _require_scratch_nocheck for one
of the tests.
OK, here's V3 of the patch. WDYT?
- Ted
commit b9d9da8b901acc5b6cb5da7149b7e8ce986e436e
Author: Theodore Ts'o <tytso@xxxxxxx>
Date: Sat Nov 11 23:28:51 2017 -0500
common: rework _require_ext4_mkfs_feature
In all of the places where we need check to see if mkfs.ext4 can
support a set of file system features, we also should be checking to
see if the kernel can support those file system features. So rename
_require_ext4_mkfs_feature to _require_ext4_feature, and actually
format the file system in $SCRATCH. To avoid running mkfs twice in
most tests, we will teach the tests to assume that
_require_ext4_feature actually leaves $SCRATCH formatted with a file
system with those features.
Also allow ext4/306 to run on systems where mke2fs doesn't support the
"64bit" option.
Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
diff --git a/common/rc b/common/rc
index da6213a0..6f6901c4 100644
--- a/common/rc
+++ b/common/rc
@@ -1899,31 +1899,23 @@ _require_scratch_ext4_crc()
_scratch_unmount
}
-# Check the specified feature whether it is available in mkfs.ext4 or not.
-_require_ext4_mkfs_feature()
+# Check whether the specified feature whether it is supported by
+# mkfs.ext4 and the kernel.
+_require_scratch_ext4_feature()
{
- local feature=$1
- local testfile=/tmp/$$.ext4_mkfs
+ local feature="$1"
+ local sz="$2"
if [ -z "$feature" ]; then
- echo "Usage: _require_ext4_mkfs_feature feature"
+ echo "Usage: _require_scratch_ext4_feature feature [size]"
exit 1
fi
- touch $testfile
- local result=$($MKFS_EXT4_PROG -F -O $feature -n $testfile 512m 2>&1)
- rm -f $testfile
- echo $result | grep -q "Invalid filesystem option" && \
- _notrun "mkfs.ext4 doesn't support $feature feature"
-}
-
-# this test requires the ext4 kernel support bigalloc feature
-#
-_require_ext4_bigalloc()
-{
- $MKFS_EXT4_PROG -F -O bigalloc $SCRATCH_DEV 512m >/dev/null 2>&1
+ $MKFS_EXT4_PROG -F $MKFS_OPTIONS -O "$feature" \
+ $SCRATCH_DEV $sz >>$seqres.full 2>&1 \
+ || _notrun "mkfs.ext4 doesn't support $feature feature"
_scratch_mount >/dev/null 2>&1 \
- || _notrun "Ext4 kernel doesn't support bigalloc feature"
+ || _notrun "Kernel doesn't support the ext4 feature: $feature"
_scratch_unmount
}
diff --git a/tests/ext4/003 b/tests/ext4/003
index 9be40178..bdce00d0 100755
--- a/tests/ext4/003
+++ b/tests/ext4/003
@@ -38,8 +38,7 @@ _supported_fs ext4
_supported_os Linux
_require_scratch
-_require_ext4_mkfs_feature "bigalloc"
-_require_ext4_bigalloc
+_require_scratch_ext4_feature "bigalloc" "512m"
rm -f $seqres.full
diff --git a/tests/ext4/025 b/tests/ext4/025
index 49ecb462..3e32e7f1 100755
--- a/tests/ext4/025
+++ b/tests/ext4/025
@@ -48,10 +48,9 @@ _supported_fs ext4
_supported_os Linux
_require_scratch_nocheck
_require_command "$DEBUGFS_PROG" debugfs
-_require_ext4_mkfs_feature "bigalloc,meta_bg,^resize_inode"
+_require_scratch_ext4_feature "bigalloc,meta_bg,^resize_inode"
echo "Create ext4 fs and modify first_meta_bg's value"
-_scratch_mkfs "-O bigalloc,meta_bg,^resize_inode" >> $seqres.full 2>&1
# set a big enough first_meta_bg to trigger buffer overrun
# 842150400 is from original fuzzed ext4 image in bug report
diff --git a/tests/ext4/026 b/tests/ext4/026
index 94a737ce..832e4646 100755
--- a/tests/ext4/026
+++ b/tests/ext4/026
@@ -50,9 +50,8 @@ _supported_fs ext4
_supported_os Linux
_require_scratch
_require_attrs
-_require_ext4_mkfs_feature ea_inode
+_require_scratch_ext4_feature "ea_inode"
-_scratch_mkfs_ext4 -O ea_inode >/dev/null 2>&1
_scratch_mount
# Sets an extended attribute on a file.
diff --git a/tests/ext4/306 b/tests/ext4/306
index be765e6a..70f281db 100755
--- a/tests/ext4/306
+++ b/tests/ext4/306
@@ -44,12 +44,15 @@ _supported_fs ext4
_supported_os Linux
_require_scratch
-_require_ext4_mkfs_feature "64bit"
rm -f $seqres.full
# Make a small ext4 fs with extents disabled & mount it
-$MKFS_EXT4_PROG -F -O ^extents,^64bit $SCRATCH_DEV 512m >> $seqres.full 2>&1
+features="^extents"
+if grep -q 64bit /etc/mke2fs.conf ; then
+ features="^extents,^64bit"
+fi
+$MKFS_EXT4_PROG -F -O "$features" $SCRATCH_DEV 512m >> $seqres.full 2>&1
_scratch_mount || _fail "couldn't mount fs"
# Create a small non-extent-based file
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
