aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2022-06-21 00:36:16 -0400
committerTheodore Ts'o <tytso@mit.edu>2022-06-21 00:36:16 -0400
commit8548bd11e6f61a5f201fc18f71de8ec91702e63d (patch)
treeac14c89bd033f8e5d22373439ebfce6411874df0
parent3b4b532e7c82bb17dbe50cf30ff933554ebf28cb (diff)
downloadxfstests-bld-8548bd11e6f61a5f201fc18f71de8ec91702e63d.tar.gz
test-appliance: don't use the noload mount option for ext4/nojournal
Create the file system without using a journal, instead of using the noload mount option. Using the noload mount option will cause some FITRIM related tests to fail if the block device supports discard. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rw-r--r--test-appliance/files/root/fs/ext4/cfg/nojournal4
1 files changed, 2 insertions, 2 deletions
diff --git a/test-appliance/files/root/fs/ext4/cfg/nojournal b/test-appliance/files/root/fs/ext4/cfg/nojournal
index 715ad31b..e15f932f 100644
--- a/test-appliance/files/root/fs/ext4/cfg/nojournal
+++ b/test-appliance/files/root/fs/ext4/cfg/nojournal
@@ -1,4 +1,4 @@
SIZE=small
-export EXT_MKFS_OPTIONS="-b 4096"
-export EXT_MOUNT_OPTIONS="noload"
+export EXT_MKFS_OPTIONS="-b 4096 -O ^has_journal"
+export EXT_MOUNT_OPTIONS=""
TESTNAME="Ext4 4k block w/ no journal"